Merge branch 'HEP-FCC:main' into gmarchio-main-ModuleThetaReadout

HEP-FCC · Aug 25, 2023 · 61b5d15 · 61b5d15
2 parents e05fbbb + d6d214d
commit 61b5d15
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 26 deletions.
diff --git a/RecCalorimeter/CMakeLists.txt b/RecCalorimeter/CMakeLists.txt
@@ -28,9 +28,6 @@ install(TARGETS k4RecCalorimeterPlugins
 
 include(CTest)
 
-add_test(NAME TemporaryTest
-         COMMAND k4run -h)
-
 #install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/tests/options DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/Reconstruction/RecCalorimeter)
 #
 #gaudi_add_test(genJetClustering

diff --git a/RecFCCeeCalorimeter/CMakeLists.txt b/RecFCCeeCalorimeter/CMakeLists.txt
@@ -28,16 +28,21 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/tests DESTINATION ${CMAKE_INSTALL_DA
 
 add_test(NAME FCCeeLAr_reproduceSegfault
          COMMAND k4run RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
-         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+)
+set_test_env(FCCeeLAr_reproduceSegfault)
 
 add_test(NAME FCCeeLAr_simulateForReco
          COMMAND k4run RecFCCeeCalorimeter/tests/options/runCaloSim.py
-         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+)
+set_test_env(FCCeeLAr_simulateForReco)
 
 add_test(NAME FCCeeLAr_slidingWindowClustering
          COMMAND k4run RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-           )
+)
+set_test_env(FCCeeLAr_slidingWindowClustering)
 set_tests_properties(FCCeeLAr_slidingWindowClustering PROPERTIES DEPENDS "FCCeeLAr_simulateForReco")
 
 add_test(NAME FCCeeLAr_benchmarkCalibration

diff --git a/RecFCCeeCalorimeter/tests/options/fcc_ee_caloBenchmarkCalibration.py b/RecFCCeeCalorimeter/tests/options/fcc_ee_caloBenchmarkCalibration.py
@@ -24,7 +24,8 @@
 DETECTORS = [
     'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
 ]
-GEOSERVICE.detectors = [os.path.join(DETECTORPATH, d) for d in DETECTORS]
+for det in DETECTORS:
+    GEOSERVICE.detectors += [os.path.join(DETECTORPATH, det)]
 GEOSERVICE.OutputLevel = INFO
 ApplicationMgr().ExtSvc += [GEOSERVICE]
 

diff --git a/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py b/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
@@ -60,13 +60,13 @@
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-path_to_detector = os.environ.get("FCCDETECTORS", "")
-print(path_to_detector)
-detectors_to_use=[
-                    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
-                  ]
-# prefix all xmls with path_to_detector
-geoservice.detectors = [os.path.join(path_to_detector, _det) for _det in detectors_to_use]
+path_to_detectors = os.environ.get("FCCDETECTORS", "")
+detectors = [
+    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
+]
+# prefix all xmls with path_to_detectors
+for det in detectors:
+    geoservice.detectors += [os.path.join(path_to_detectors, det)]
 geoservice.OutputLevel = INFO
 
 # Geant4 service

diff --git a/RecFCCeeCalorimeter/tests/options/runCaloSim.py b/RecFCCeeCalorimeter/tests/options/runCaloSim.py
@@ -46,12 +46,13 @@
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-path_to_detector = os.environ.get("FCCDETECTORS", "")
-detectors_to_use=[
-                    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
-                  ]
-# prefix all xmls with path_to_detector
-geoservice.detectors = [os.path.join(path_to_detector, _det) for _det in detectors_to_use]
+path_to_detectors = os.environ.get("FCCDETECTORS", "")
+detectors = [
+    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml',
+]
+# prefix all xmls with path_to_detectors
+for det in detectors:
+    geoservice.detectors += [os.path.join(path_to_detectors, det)]
 geoservice.OutputLevel = INFO
 ApplicationMgr().ExtSvc += [geoservice]
 

diff --git a/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py b/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
@@ -1,3 +1,4 @@
+import os
 # Setup
 # Names of cells collections
 ecalBarrelCellsName = "ECalBarrelCells"
@@ -22,12 +23,13 @@
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc")
 # if FCC_DETECTORS is empty, this should use relative path to working directory
-path_to_detector = os.environ.get("FCCDETECTORS", "")
-detectors_to_use=[
-                    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml'
-                  ]
-# prefix all xmls with path_to_detector
-geoservice.detectors = [os.path.join(path_to_detector, _det) for _det in detectors_to_use]
+path_to_detectors = os.environ.get("FCCDETECTORS", "")
+detectors = [
+    'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml'
+]
+# prefix all xmls with path_to_detectors
+for det in detectors:
+    geoservice.detectors += [os.path.join(path_to_detectors, det)]
 geoservice.OutputLevel = WARNING