From 4c42f0664be46cb091fe491dde7e9f9ec90d40c4 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Tue, 25 Jun 2024 14:42:39 +0200 Subject: [PATCH 1/3] Update used detector model --- CLDConfig/CLDReconstruction.py | 2 +- CLDConfig/cld_steer.py | 2 +- test/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CLDConfig/CLDReconstruction.py b/CLDConfig/CLDReconstruction.py index 5e1b225..19617e4 100644 --- a/CLDConfig/CLDReconstruction.py +++ b/CLDConfig/CLDReconstruction.py @@ -55,7 +55,7 @@ from Configurables import GeoSvc, TrackingCellIDEncodingSvc geoservice = GeoSvc("GeoSvc") -geoservice.detectors = [os.environ["K4GEO"]+"/FCCee/CLD/compact/CLD_o2_v05/CLD_o2_v05.xml"] +geoservice.detectors = [os.environ["K4GEO"]+"/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml"] geoservice.OutputLevel = INFO geoservice.EnableGeant4Geo = False svcList.append(geoservice) diff --git a/CLDConfig/cld_steer.py b/CLDConfig/cld_steer.py index 59f35b7..b3fa610 100644 --- a/CLDConfig/cld_steer.py +++ b/CLDConfig/cld_steer.py @@ -23,7 +23,7 @@ SIM = DD4hepSimulation() ## The compact XML file -SIM.compactFile = "" +SIM.compactFile = os.environ["K4GEO"]+"/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml" ## Lorentz boost for the crossing angle, in radian! SIM.crossingAngleBoost = 0.015 SIM.enableDetailedShowerMode = True diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 41fe76a..b9009d6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,7 +18,7 @@ limitations under the License. ]] include(CTest) -set(DETECTOR $ENV{K4GEO}/FCCee/CLD/compact/FCCee_o1_v04/FCCee_o1_v04.xml) +set(DETECTOR $ENV{K4GEO}/FCCee/CLD/compact/CLD_o2_v06/CLD_o2_v06.xml) set(CLDConfig_DIR ${CMAKE_CURRENT_LIST_DIR}/../CLDConfig) add_test(NAME ddsim_lcio From 812792d791317cbd6032826c814b6a58be9e565c Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Tue, 25 Jun 2024 14:59:56 +0200 Subject: [PATCH 2/3] add LCFIJet test --- test/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b9009d6..4d840ca 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -49,3 +49,9 @@ add_test(NAME trkOnly COMMAND k4run --trackingOnly --inputFiles=test.edm4hep.root --outputBasename=trkOnly_test_edm4hep CLDReconstruction.py --GeoSvc.detectors=${DETECTOR} ) set_property(TEST trkOnly APPEND PROPERTY DEPENDS ddsim_edm4hep) + +add_test(NAME LCFIJet + WORKING_DIRECTORY ${CLDConfig_DIR} + COMMAND k4run --enableLCFIJet --inputFiles=test.edm4hep.root --outputBasename=trkOnly_test_edm4hep CLDReconstruction.py --GeoSvc.detectors=${DETECTOR} +) +set_property(TEST LCFIJet APPEND PROPERTY DEPENDS ddsim_edm4hep) From a84c76dc456ec183f2478e0675aeb6bb1d8faaa7 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Wed, 26 Jun 2024 10:17:50 +0200 Subject: [PATCH 3/3] Add test for k4run --help --- test/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4d840ca..84a5a2c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -55,3 +55,9 @@ add_test(NAME LCFIJet COMMAND k4run --enableLCFIJet --inputFiles=test.edm4hep.root --outputBasename=trkOnly_test_edm4hep CLDReconstruction.py --GeoSvc.detectors=${DETECTOR} ) set_property(TEST LCFIJet APPEND PROPERTY DEPENDS ddsim_edm4hep) + +add_test(NAME Help + WORKING_DIRECTORY ${CLDConfig_DIR} + COMMAND k4run --help CLDReconstruction.py +) +set_property(TEST Help APPEND PROPERTY PASS_REGULAR_EXPRESSION "show this help message and exit")