From e582cffbca8fc377028a81ec331d95fc1ce7eb9e Mon Sep 17 00:00:00 2001
From: FASER Reco <faserrec@lxplus979.cern.ch>
Date: Thu, 30 Jan 2025 22:26:48 +0100
Subject: [PATCH] Update unit tests for R24
---
.../NeutrinoHits/CMakeLists.txt | 3 ++-
.../Reconstruction/CMakeLists.txt | 20 ++++++++++++-----
.../Reconstruction/scripts/faser_reco.py | 10 ---------
.../TrackerDataAccessExample/CMakeLists.txt | 4 +++-
.../python/TrackerDataAccessExampleConfig.py | 2 +-
.../TriggerDataAccessExample/CMakeLists.txt | 4 +++-
.../python/TriggerDataAccessExampleConfig.py | 22 +++++++++----------
.../WaveformDataAccessExample/CMakeLists.txt | 4 +++-
.../python/WaveformDataAccessExampleConfig.py | 18 +++++++--------
.../GeoModel/FaserGeoModel/CMakeLists.txt | 3 ++-
.../GeoModelFaserUtilities/CMakeLists.txt | 6 +++--
.../python/MagFieldServicesConfig.py | 2 +-
.../EmulsionGeoModel/CMakeLists.txt | 3 ++-
.../test/EmulsionGMConfig_test.py | 2 +-
.../PreshowerGeoModel/CMakeLists.txt | 3 ++-
.../test/PreshowerGMConfig_test.py | 2 +-
.../TriggerGeoModel/CMakeLists.txt | 3 ++-
.../test/TriggerGMConfig_test.py | 2 +-
.../ScintDetDescr/VetoGeoModel/CMakeLists.txt | 3 ++-
.../VetoGeoModel/test/VetoGMConfig_test.py | 2 +-
.../VetoNuGeoModel/CMakeLists.txt | 3 ++-
.../test/VetoNuGMConfig_test.py | 2 +-
Simulation/G4Faser/G4FaserAlg/CMakeLists.txt | 18 ++++++++++-----
.../G4FaserAlg/test/G4FaserAlgConfig_Test.py | 4 ++--
.../DipoleGeoModel/CMakeLists.txt | 3 ++-
.../FaserSCT_GeoModel/CMakeLists.txt | 3 ++-
.../Acts/FaserActsGeometry/CMakeLists.txt | 3 ++-
27 files changed, 89 insertions(+), 65 deletions(-)
diff --git a/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt b/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt
index 299a92138..4296cf138 100644
--- a/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt
+++ b/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt
@@ -10,5 +10,6 @@ atlas_install_scripts( scripts/*.sh scripts/*.py )
atlas_add_test( ProdNeutrinoHits
SCRIPT scripts/faser_dumpnu.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/FaserMC-MC22_PG_muon_fasernu_100GeV-100012-00000-HITS.root
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh)
diff --git a/Control/CalypsoExample/Reconstruction/CMakeLists.txt b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
index 23af9627f..a69e9811d 100644
--- a/Control/CalypsoExample/Reconstruction/CMakeLists.txt
+++ b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
@@ -19,22 +19,32 @@ atlas_install_scripts( scripts/*.sh scripts/*.py )
atlas_add_test( ProdRecoTI12
SCRIPT scripts/faser_reco.py --geom=TI12Data ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-001920-filtered.raw
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
atlas_add_test( ProdRecoTestBeam
SCRIPT scripts/faser_reco.py --geom=TestBeamData ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-003613-filtered.raw
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
atlas_add_test( ProdRecoPilotTracks
SCRIPT scripts/faser_reco.py --geom=TI12Data ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-pilot_tracks-filtered.raw
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
# Test of TI12Data02 geometry (should auto-select from run number)
atlas_add_test( ProdRecoTI12-02-2022
SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-006525-filtered.raw
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
# Test of TI12Data03 geometry (should auto-select from run number)
atlas_add_test( ProdRecoTI12-03-2022
SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-007833-00003-TrigMask08.raw
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index c5fc6d5f2..3c990f39b 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -112,18 +112,8 @@ if args.isMC:
else:
configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions
-<<<<<<< HEAD
-<<<<<<< HEAD
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
-=======
-ConfigFlags.Input.ProjectName = "data20"
-#ConfigFlags.GeoModel.Align.Dynamic = False
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
-configFlags.Input.ProjectName = "data20"
-#configFlags.GeoModel.Align.Dynamic = False
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Exec.SkipEvents = args.skip
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt
index 81fea4e21..299b5b2e4 100644
--- a/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt
@@ -15,6 +15,8 @@ atlas_install_python_modules( python/*.py )
# Test(s) in the package:
atlas_add_test( TrackerDataAccessTest
SCRIPT python/TrackerDataAccessExampleConfig.py ${CMAKE_CURRENT_SOURCE_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index 9b2df67da..bd5a97255 100755
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -38,7 +38,7 @@ if __name__ == "__main__":
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
- configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use MC conditions for now
+ configFlags.IOVDb.DatabaseInstance = "CONDBR3"
configFlags.GeoModel.FaserVersion = "FASER-01" # FASER geometry
configFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
#configFlags.GeoModel.Align.Dynamic = False
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt
index 7d0275a89..526937c97 100644
--- a/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt
@@ -15,5 +15,7 @@ atlas_install_python_modules( python/*.py )
# Test(s) in the package:
atlas_add_test( TriggerDataAccessTest
SCRIPT python/TriggerDataAccessExampleConfig.py ${CMAKE_CURRENT_SOURCE_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
index a4c2d3fad..08057518a 100755
--- a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
@@ -37,29 +37,29 @@ if __name__ == "__main__":
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
- configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+ configFlags.IOVDb.DatabaseInstance = "CONDBR3"
configFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
- configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
+ #configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
configFlags.lock()
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
- from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
+ #from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
acc = MainServicesCfg(configFlags)
- acc.merge(PoolWriteCfg(configFlags))
+ #acc.merge(PoolWriteCfg(configFlags))
# Configure output
- from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- itemList = [ "xAOD::EventInfo#*",
- "xAOD::EventAuxInfo#*",
- "xAOD::FaserTriggerData#*",
- "xAOD::FaserTriggerDataAux#*" ]
- acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
- ostream = acc.getEventAlgo("OutputStreamRDO")
+ #from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ #itemList = [ "xAOD::EventInfo#*",
+ # "xAOD::EventAuxInfo#*",
+ # "xAOD::FaserTriggerData#*",
+ # "xAOD::FaserTriggerDataAux#*" ]
+ #acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
+ #ostream = acc.getEventAlgo("OutputStreamRDO")
# Set up algorithm
acc.merge(TriggerDataAccessExampleCfg(configFlags))
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
index 703ced096..7a0843f28 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
@@ -15,5 +15,7 @@ atlas_install_python_modules( python/*.py )
# Test(s) in the package:
atlas_add_test( WaveformDataAccessTest
SCRIPT python/WaveformDataAccessExampleConfig.py ${CMAKE_CURRENT_SOURCE_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh
+ )
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
index cdabb3d75..82fa0eb93 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -39,12 +39,12 @@ if __name__ == "__main__":
configFlags.Input.isMC = False # Needed to bypass autoconfig
# configFlags.Input.Format = Format.BS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
- configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use MC conditions for now
+ configFlags.IOVDb.DatabaseInstance = "CONDBR3"
configFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
- configFlags.Output.RDOFileName = "waveform.RDO.pool.root"
+ #configFlags.Output.RDOFileName = "waveform.RDO.pool.root"
configFlags.lock()
# Configure components
@@ -52,15 +52,15 @@ if __name__ == "__main__":
from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
acc = MainServicesCfg(configFlags)
- acc.merge(PoolWriteCfg(configFlags))
+ #acc.merge(PoolWriteCfg(configFlags))
# Configure output
- from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- itemList = [ "xAOD::EventInfo#*",
- "xAOD::EventAuxInfo#*",
- "RawWaveformContainer#*"
- ]
- acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
+ #from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ #itemList = [ "xAOD::EventInfo#*",
+ # "xAOD::EventAuxInfo#*",
+ # "RawWaveformContainer#*"
+ # ]
+ #acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
# ostream = acc.getEventAlgo("OutputStreamRDO")
# Set up algorithm
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
index 38a8976da..8dcb464af 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
@@ -32,4 +32,5 @@ atlas_install_scripts( test/*.py )
atlas_add_test( EVNT_InputGeo_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/FaserGeometryConfig_EVNT_test.py
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
diff --git a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
index f4b076f7c..0d0ac607b 100644
--- a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
@@ -20,11 +20,13 @@ atlas_add_library( GeoModelFaserUtilities
atlas_add_test( GeoGetIds_test
SOURCES test/GeoGetIds_test.cxx
- LINK_LIBRARIES GeoModelFaserUtilities )
+ LINK_LIBRARIES GeoModelFaserUtilities
+ POST_EXEC_SCRIPT noerror.sh)
atlas_add_test( GeoVisitVolumes_test
SOURCES test/GeoVisitVolumes_test.cxx
- LINK_LIBRARIES GeoModelFaserUtilities )
+ LINK_LIBRARIES GeoModelFaserUtilities
+ POST_EXEC_SCRIPT noerror.sh)
endif()
if(BUILDVP1LIGHT)
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
index f079b5a72..0a9bf76a6 100644
--- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
+++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
@@ -109,7 +109,7 @@ if __name__=="__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.RAW
+ configFlags.Input.Files = []
configFlags.Input.isMC = False
configFlags.lock()
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt
index 71d3ffbd6..33ff27765 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( EmulsionGeoModel
atlas_add_test( EmulsionGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/EmulsionGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
index a9573925c..4d79e5bbd 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.HITS
+ configFlags.Input.Files = []
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
index a58ffa956..7e89c7d6c 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( PreshowerGeoModel
atlas_add_test( PreshowerGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/PreshowerGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
index 3727679b6..78e7f72a2 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.HITS
+ configFlags.Input.Files = []
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt
index 38946b29e..72122c0a5 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( TriggerGeoModel
atlas_add_test( TriggerGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/TriggerGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
index 46633f98f..bb9ae95cc 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.HITS
+ configFlags.Input.Files = []
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
index d5c979d40..8ff47a09a 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( VetoGeoModel
atlas_add_test( VetoGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/VetoGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Install files from the package:
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
index a1f7a79e1..de26103e7 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.HITS
+ configFlags.Input.Files = []
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt
index 404a64a14..1db3dca18 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( VetoNuGeoModel
atlas_add_test( VetoNuGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/VetoNuGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Install files from the package:
diff --git a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
index 99d97bb1c..81ae3f94d 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
configFlags = initConfigFlags()
- configFlags.Input.Files = defaultTestFiles.HITS
+ configFlags.Input.Files = []
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
diff --git a/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt b/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
index 0bb8f4144..54d26dc21 100644
--- a/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
+++ b/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
@@ -32,32 +32,38 @@ atlas_add_library( G4FaserAlg
atlas_add_test( G4FaserAlgConfig_TestFaser
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASER-01'" IOVDb.GlobalTag="'OFLCOND-FASER-01'" Output.HITSFileName='faser.HITS.pool.root'
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( G4FaserAlgConfig_TestFaserNu03
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASERNU-03'" IOVDb.GlobalTag="'OFLCOND-FASER-02'" Output.HITSFileName='faserNu03.HITS.pool.root'
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( G4FaserAlgConfig_TestFaserNu03_NewField
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASERNU-03'" IOVDb.GlobalTag="'OFLCOND-FASER-03'" Output.HITSFileName='faserNu03_NewField.HITS.pool.root'
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( G4FaserAlgConfig_TestFaserNu04
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASERNU-04'" IOVDb.GlobalTag="'OFLCOND-FASER-03'" Output.HITSFileName='faserNu04.HITS.pool.root'
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( G4FaserAlgConfig_TestTestbeam00
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASER-TB00'" IOVDb.GlobalTag="'OFLCOND-FASER-TB00'" Output.HITSFileName='tb00.HITS.pool.root'
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
atlas_add_test( G4FaserAlgConfig_TestTestbeam01
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASER-TB01'" IOVDb.GlobalTag="'OFLCOND-FASER-TB00'" Output.HITSFileName='tb01.HITS.pool.root'
PROPERTIES TIMEOUT 300
- PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ POST_EXEC_SCRIPT nopost.sh)
# Install files from the package:
diff --git a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py
index 48cb26054..52b464a57 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py
@@ -57,7 +57,7 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.yshift", 0)
configFlags.GeoModel.FaserVersion = "FASERNU-04" # Geometry set-up
- configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
+ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04" # Conditions set-up
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
#
@@ -242,5 +242,5 @@ if __name__ == '__main__':
#
# Success should be 0
#
- sys.exit(not sc.isSuccess())
+ sys.exit(sc.isSuccess())
diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
index 66d08f6cf..46a114858 100644
--- a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( DipoleGeoModel
atlas_add_test( DipoleGMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/DipoleGMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
index 0e660cf5b..9593f5e53 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( FaserSCT_GeoModel
atlas_add_test( FaserSCT_GMConfig_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/FaserSCT_GMConfig_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT noerror.sh)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
index a98e94027..20567a27c 100755
--- a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
@@ -89,4 +89,5 @@ atlas_install_scripts( test/*.py )
atlas_add_test( FaserActsGeometryBoundary_test
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/FaserActsGeometryBoundary_test.py
PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- PROPERTIES TIMEOUT 300 )
+ PROPERTIES TIMEOUT 300
+ POST_EXEC_SCRIPT nopost.sh)
--
GitLab