From 39a7e4ffe560c93236a9fc2b1dcdd5acbd450134 Mon Sep 17 00:00:00 2001 From: faltovaj Date: Tue, 9 Jan 2024 11:31:49 +0100 Subject: [PATCH 01/12] fixing overlaps in ALLEGRO Ecal barrel geometry (#308) * fixing overlaps in ALLEGRO Ecal barrel geometry * calorimeter README updated --- .../FCCee_ECalBarrel_thetamodulemerged.xml | 13 +++++++++++-- ...el_NobleLiquid_InclinedTrapezoids_o1_v02_geo.cpp | 6 ++++-- detector/calorimeter/README.md | 2 ++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml index 4fd78287a..2a0beb3e8 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,6 +53,11 @@ + + + + + @@ -107,6 +112,10 @@ + + + + diff --git a/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v02_geo.cpp b/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v02_geo.cpp index 9f62dec88..9c2c27b2b 100644 --- a/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v02_geo.cpp +++ b/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v02_geo.cpp @@ -108,8 +108,10 @@ static dd4hep::detail::Ref_t createECalBarrelInclined(dd4hep::Detector& aLcdd, double passiveThickness = passiveInnerThicknessMin + passiveOuterThickness + passiveGlueThickness; double angle = passive.rotation().angle(); - double bathRmin = caloDim.rmin(); // - margin for inclination - double bathRmax = caloDim.rmax(); // + margin for inclination + dd4hep::xml::DetElement bath = aXmlElement.child(_Unicode(bath)); + dd4hep::xml::Dimension bathDim(bath.dimensions()); + double bathRmin = bathDim.rmin(); + double bathRmax = bathDim.rmax(); dd4hep::Tube bathOuterShape(bathRmin, bathRmax, caloDim.dz()); // make it 4 volumes + 5th for detector envelope dd4hep::Tube bathAndServicesOuterShape(cryoDim.rmin2(), cryoDim.rmax1(), caloDim.dz()); // make it 4 volumes + 5th for detector envelope if (cryoThicknessFront > 0) { diff --git a/detector/calorimeter/README.md b/detector/calorimeter/README.md index f7efc63b6..3bcd9a375 100644 --- a/detector/calorimeter/README.md +++ b/detector/calorimeter/README.md @@ -14,6 +14,8 @@ Original version taken from [FCCDetectors](https://github.com/HEP-FCC/FCCDetecto ### o1_v02 New version, with module-theta based segmentation. In each layer adjacent cells along theta or module directions can be grouped together, with possibly different merging per layer. This is specified with the `mergedCells_Theta` and `mergedModules` vectors in the `segmentation` tag of the xml file. The baseline grouping in theta is by four in all layers except L1 (the strip layer). The baseline grouping in module direction is by two in all layers. The LAr gap has also been slightly adjusted to bring back the number of modules to 1536 (it was 1545 before). The segmentation class needs to know the number of modules, which is passed via the `nModules` parameter of the `segmentation` tag. To ensure that number of modules and layers (length of the mergedXXX vectors) are consistent with number of modules and layers of the detector, the xml defines `ECalBarrelNumLayers` and `ECalBarrelNumPlanes`, and the c++ file doing the detector construction checks that the number of planes and layers calculated dynamically from other parameters matches that in the xml (if not, the code will crash). +Overlaps in the LAr bath volume fixed. + ## CaloDisks This sub-detector makes calorimeter endcaps (original and reflected). It is used in ALLEGRO detector concept. From db731c79ac00419f10e40b9c7c642f5d301fb3c5 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 11 Dec 2023 18:49:08 +0100 Subject: [PATCH 02/12] Change LCIO::LCIO to LCIO::lcio --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 384999510..d467551ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,8 +85,8 @@ add_library(lcgeo ALIAS k4geo) target_include_directories(${PackageName} PRIVATE ${PROJECT_SOURCE_DIR}/detector/include ) target_include_directories(${PackageName}G4 PRIVATE ${PROJECT_SOURCE_DIR}/detector/include ) -target_link_libraries(${PackageName} DD4hep::DDCore DD4hep::DDRec DD4hep::DDParsers ROOT::Core LCIO::LCIO detectorSegmentations) -target_link_libraries(${PackageName}G4 DD4hep::DDCore DD4hep::DDRec DD4hep::DDParsers DD4hep::DDG4 ROOT::Core ${Geant4_LIBRARIES} LCIO::LCIO) +target_link_libraries(${PackageName} DD4hep::DDCore DD4hep::DDRec DD4hep::DDParsers ROOT::Core LCIO::lcio detectorSegmentations) +target_link_libraries(${PackageName}G4 DD4hep::DDCore DD4hep::DDRec DD4hep::DDParsers DD4hep::DDG4 ROOT::Core ${Geant4_LIBRARIES} LCIO::lcio) #Create this_package.sh file, and install dd4hep_instantiate_package(${PackageName}) From 444e6d18f7bd1acf75196f7f6981e92234638d82 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 29 Jan 2024 08:50:29 +0100 Subject: [PATCH 03/12] Add a key4hep build workflow; previous commit: Change LCIO::LCIO to LCIO::lcio --- .github/workflows/key4hep-build.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/key4hep-build.yaml diff --git a/.github/workflows/key4hep-build.yaml b/.github/workflows/key4hep-build.yaml new file mode 100644 index 000000000..deeea38c4 --- /dev/null +++ b/.github/workflows/key4hep-build.yaml @@ -0,0 +1,20 @@ +name: Key4hep build + +on: + push: + workflow_dispatch: + +jobs: + build: + strategy: + matrix: + build_type: ["release", "nightly"] + image: ["alma9", "ubuntu22", "centos7"] + fail-fast: false + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: key4hep/key4hep-actions/key4hep-build@main + with: + build_type: ${{ matrix.build_type }} + image: ${{ matrix.image }} From a2d22ce5b7ebb6ce66c1a0bcf2907e7d2be6bf5b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 5 Feb 2024 14:31:05 +0100 Subject: [PATCH 04/12] Change key4hep-build workflow triggers; previous commit: Add a key4hep build workflow; previous commit: Change LCIO::LCIO to LCIO::lcio --- .github/workflows/key4hep-build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/key4hep-build.yaml b/.github/workflows/key4hep-build.yaml index deeea38c4..3f9007f09 100644 --- a/.github/workflows/key4hep-build.yaml +++ b/.github/workflows/key4hep-build.yaml @@ -2,6 +2,9 @@ name: Key4hep build on: push: + branches: + - main + pull_request: workflow_dispatch: jobs: @@ -13,7 +16,7 @@ jobs: fail-fast: false runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: key4hep/key4hep-actions/key4hep-build@main with: build_type: ${{ matrix.build_type }} From 953441c383999da140c901fd305ab51c1c34e7fa Mon Sep 17 00:00:00 2001 From: BrieucF Date: Tue, 9 Jan 2024 19:01:47 +0100 Subject: [PATCH 05/12] [ALLEGRO] File and variable renaming plus propagation of overlap fix --- ..._DectDimensions.xml => DectDimensions.xml} | 0 ...ectEmptyMaster.xml => DectEmptyMaster.xml} | 0 ...d.xml => ECalBarrel_thetamodulemerged.xml} | 16 +++-- ...lBarrel_thetamodulemerged_calibration.xml} | 25 ++++---- ...ECalBarrel_thetamodulemerged_upstream.xml} | 29 +++++----- ..._coneCryo.xml => ECalEndcaps_coneCryo.xml} | 0 ...rel_TileCal.xml => HCalBarrel_TileCal.xml} | 0 ...xml => HCalEndcaps_ThreeParts_TileCal.xml} | 0 .../ALLEGRO_o1_v02/SimplifiedDriftChamber.xml | 58 ------------------- 9 files changed, 37 insertions(+), 91 deletions(-) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_DectDimensions.xml => DectDimensions.xml} (100%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_DectEmptyMaster.xml => DectEmptyMaster.xml} (100%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_ECalBarrel_thetamodulemerged.xml => ECalBarrel_thetamodulemerged.xml} (93%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_ECalBarrel_thetamodulemerged_calibration.xml => ECalBarrel_thetamodulemerged_calibration.xml} (92%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_ECalBarrel_thetamodulemerged_upstream.xml => ECalBarrel_thetamodulemerged_upstream.xml} (90%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_EcalEndcaps_coneCryo.xml => ECalEndcaps_coneCryo.xml} (100%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_HCalBarrel_TileCal.xml => HCalBarrel_TileCal.xml} (100%) rename FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/{FCCee_HCalEndcaps_ThreeParts_TileCal.xml => HCalEndcaps_ThreeParts_TileCal.xml} (100%) delete mode 100644 FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/SimplifiedDriftChamber.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_DectDimensions.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectDimensions.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_DectDimensions.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectDimensions.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_DectEmptyMaster.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_DectEmptyMaster.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged.xml similarity index 93% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged.xml index 2a0beb3e8..9cf284bf0 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged.xml @@ -23,8 +23,8 @@ - - + + @@ -42,24 +42,22 @@ - - + + - - + + - - @@ -119,7 +117,7 @@ - + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged_calibration.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml similarity index 92% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged_calibration.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml index be8770709..d69ba26f9 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged_calibration.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml @@ -15,11 +15,11 @@ - - + + - + @@ -34,19 +34,22 @@ - - + + - - + + - - + + + + + @@ -102,7 +105,7 @@ - + @@ -133,4 +136,4 @@ - \ No newline at end of file + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged_upstream.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml similarity index 90% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged_upstream.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml index 8c96a5939..ee39e57a5 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged_upstream.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml @@ -15,17 +15,17 @@ - - + + - + - + @@ -34,19 +34,22 @@ - - + + - - + + - - + + + + + @@ -75,7 +78,7 @@ - + system:4,cryo:1,type:3,subtype:3,layer:8,module:11,theta:10 @@ -102,7 +105,7 @@ - + @@ -133,4 +136,4 @@ - \ No newline at end of file + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_EcalEndcaps_coneCryo.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalEndcaps_coneCryo.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_EcalEndcaps_coneCryo.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalEndcaps_coneCryo.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_HCalBarrel_TileCal.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/HCalBarrel_TileCal.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_HCalBarrel_TileCal.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/HCalBarrel_TileCal.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_HCalEndcaps_ThreeParts_TileCal.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/HCalEndcaps_ThreeParts_TileCal.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_HCalEndcaps_ThreeParts_TileCal.xml rename to FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/HCalEndcaps_ThreeParts_TileCal.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/SimplifiedDriftChamber.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/SimplifiedDriftChamber.xml deleted file mode 100644 index 9d13d0176..000000000 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/SimplifiedDriftChamber.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - A simplified implementation of the drift chamber for the FCCee-IDEA concept - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${GlobalTrackerReadoutID_DCH} - - - - - - - - Dimensions for the drift chamber - - - - - - - From 17fc2fb68c148263657fbb261dab6ee40e77d026 Mon Sep 17 00:00:00 2001 From: BrieucF Date: Tue, 9 Jan 2024 19:03:29 +0100 Subject: [PATCH 06/12] [ALLEGRO] Replacing the simplified drift chamber by the detailed one --- .../compact/ALLEGRO_o1_v02/ALLEGRO_o1_v02.xml | 12 +- .../compact/ALLEGRO_o1_v02/DectDimensions.xml | 6 +- .../compact/ALLEGRO_o1_v02/DriftChamber.xml | 110 +++++++++++++++++ .../compact/ALLEGRO_o1_v02/materials.xml | 116 +++++++++++++++++- FCCee/ALLEGRO/compact/README.md | 4 +- 5 files changed, 232 insertions(+), 16 deletions(-) create mode 100644 FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DriftChamber.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ALLEGRO_o1_v02.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ALLEGRO_o1_v02.xml index ff4266dd9..bf4b652fe 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ALLEGRO_o1_v02.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ALLEGRO_o1_v02.xml @@ -28,7 +28,7 @@ - + @@ -36,11 +36,11 @@ - - - - - + + + + + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectDimensions.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectDimensions.xml index 439e20cdd..237223204 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectDimensions.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectDimensions.xml @@ -84,9 +84,9 @@ - - - + + + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DriftChamber.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DriftChamber.xml new file mode 100644 index 000000000..b24fa784f --- /dev/null +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DriftChamber.xml @@ -0,0 +1,110 @@ + + + + Detector description for the IDEA Drift Chamber. To understand the free parameters below, look e.g. at https://indico.cern.ch/event/932973/contributions/4041314/attachments/2139657/3664808/primavera_FCCworkshop_2020.pdf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + system:4,superLayer:5,layer:5,phi:11,hitorigin:3,stereo:1,layerInCell:2 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/materials.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/materials.xml index a899266c3..7fe008147 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/materials.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/materials.xml @@ -225,14 +225,118 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff --git a/FCCee/ALLEGRO/compact/README.md b/FCCee/ALLEGRO/compact/README.md index 9a6ded62d..aecc08265 100644 --- a/FCCee/ALLEGRO/compact/README.md +++ b/FCCee/ALLEGRO/compact/README.md @@ -2,4 +2,6 @@ ALLEGRO ======================== ALLEGRO_o1_v01: it is a liquid Noble gas based detector. This version picked from the latest version in FCCDetectors repo. -ALLEGRO_o1_v02: evolves from o1_v01, replacing the barrel ECAL. This version has a constant cell size in theta for the ECAL barrel (instead of eta as in o1_v01) and now it is possible to have a different number of cells merged for each longitudinal layer. +ALLEGRO_o1_v02: evolves from o1_v01, replacing the barrel ECAL and adding a detailed version drift chamber. +This version has a constant cell size in theta for the ECAL barrel (instead of eta as in o1_v01) and now it is possible to have a different number of cells merged for each longitudinal layer. +Known caveat: the drift chamber has a larger z extent than in the IDEA detector but the wire spacing was not re-optimized. It is ok software-wise but the currently implemented design is not fully compliant with R&D considerations, will need a new drift chamber layout from the detector concept team. From 1fbfaab282c4b92138592765eb638e4439dd1ae8 Mon Sep 17 00:00:00 2001 From: BrieucF Date: Tue, 9 Jan 2024 19:19:56 +0100 Subject: [PATCH 07/12] [TESTS] Add a test for ALLEGRO_o1_v02 --- lcgeoTests/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lcgeoTests/CMakeLists.txt b/lcgeoTests/CMakeLists.txt index 635a52c7c..909fbdee6 100644 --- a/lcgeoTests/CMakeLists.txt +++ b/lcgeoTests/CMakeLists.txt @@ -86,6 +86,13 @@ ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/IDEA/compact/IDEA_o1_v02/IDEA_o1_v02.xml --runType=batch -G -N=1 --outputFile=testIDEA_o1_v02.slcio ) SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" TIMEOUT 240) +#-------------------------------------------------- +# test for ALLEGRO o1 v02 +SET( test_name "test_ALLEGRO_o1_v02" ) +ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" + ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ALLEGRO_o1_v02.xml --runType=batch -G -N=1 --outputFile=testALLEGRO_o1_v02.root ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) + #-------------------------------------------------- # test for ARC o1 v01 SET( test_name "test_ARC_o1_v01_run" ) From 42c73b0108e5c00d56c92819716e0984b1c9b670 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Mon, 11 Dec 2023 12:50:08 +0100 Subject: [PATCH 08/12] Printing "Found:...." in downstream projects --- cmake/k4geoConfig.cmake.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/k4geoConfig.cmake.in b/cmake/k4geoConfig.cmake.in index eb98cb140..6b2985f6d 100644 --- a/cmake/k4geoConfig.cmake.in +++ b/cmake/k4geoConfig.cmake.in @@ -12,3 +12,6 @@ find_dependency(ROOT REQUIRED COMPONENTS Geom GenVector) find_dependency(LCIO REQUIRED) include(${k4geo_CMAKE_DIR}/k4geoConfig-targets.cmake) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(k4geo DEFAULT_MSG CMAKE_CURRENT_LIST_FILE) From f6c17622a0c99806b2790551503a3cab45d0d962 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Tue, 6 Feb 2024 11:21:14 +0100 Subject: [PATCH 09/12] ALLEGRO: EcalBarrel CaloData: caloDim.dZ is already the half length --- .../ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01_geo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01_geo.cpp b/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01_geo.cpp index dece89dde..d0abe7645 100644 --- a/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01_geo.cpp +++ b/detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01_geo.cpp @@ -568,7 +568,7 @@ static dd4hep::detail::Ref_t createECalBarrelInclined(dd4hep::Detector& aLcdd, caloData->extent[0] = Rmin; caloData->extent[1] = Rmax; // or r_max ? caloData->extent[2] = 0.; // NN: for barrel detectors this is 0 - caloData->extent[3] = caloDim.dz()/2; + caloData->extent[3] = caloDim.dz(); // Set type flags dd4hep::xml::setDetectorTypeFlag(xmlDetElem, caloDetElem); From 36bd6babd8e8ad847f6be517951c5f79facc467b Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Wed, 14 Feb 2024 17:08:00 +0100 Subject: [PATCH 10/12] CMake: add shim for LCIO::lcio --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d467551ae..73bd2a448 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,15 @@ message ( STATUS "ROOT_VERSION: ${ROOT_VERSION}" ) find_package( Geant4 REQUIRED ) find_package( LCIO REQUIRED) +# Shim for older LCIO versions +if(NOT TARGET LCIO::lcio) + add_library(LCIO::lcio INTERFACE IMPORTED GLOBAL) + set_target_properties(LCIO::lcio + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LCIO_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES "${LCIO_LIBRARIES}" + ) +endif() add_subdirectory(detectorSegmentations) add_subdirectory(detectorCommon) From 9889d01ba16f5eac9eed65c7f469eacacc856aca Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Fri, 16 Feb 2024 11:36:27 +0100 Subject: [PATCH 11/12] LinearSortingPolicy: ignore unavailable extension error and adapt treatment for it --- plugins/LinearSortingPolicy.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/LinearSortingPolicy.cpp b/plugins/LinearSortingPolicy.cpp index 41ca7d9e4..dde46cf9a 100644 --- a/plugins/LinearSortingPolicy.cpp +++ b/plugins/LinearSortingPolicy.cpp @@ -91,9 +91,13 @@ namespace { dd4hep::rec::DoubleParameters* para = nullptr; try { // use existing map, or create a new one - para = ddsurf->detElement().extension(); + para = ddsurf->detElement().extension(false); + if(not para) { + para = new dd4hep::rec::DoubleParameters; + ddsurf->detElement().addExtension(para); + } para->doubleParameters["SortingPolicy"] = rValue; - } catch(...){ + } catch(...) { para = new dd4hep::rec::DoubleParameters; para->doubleParameters["SortingPolicy"] = rValue; ddsurf->detElement().addExtension(para); From 92ffe4a35347524eaa351932daab774f7d067102 Mon Sep 17 00:00:00 2001 From: Giovanni Marchiori <39376142+giovannimarchiori@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:04:34 +0100 Subject: [PATCH 12/12] Update some ALLEGRO xml config files (#318) --- FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml | 6 +++--- .../ECalBarrel_thetamodulemerged_calibration.xml | 6 +++++- .../ECalBarrel_thetamodulemerged_upstream.xml | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml index a5ad3e23b..263dcce4d 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/DectEmptyMaster.xml @@ -6,8 +6,8 @@ - - + + - + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml index d69ba26f9..027f20800 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_calibration.xml @@ -102,6 +102,10 @@ + + + + @@ -136,4 +140,4 @@ - + \ No newline at end of file diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml index ee39e57a5..962746659 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/ECalBarrel_thetamodulemerged_upstream.xml @@ -25,7 +25,7 @@ - + @@ -78,7 +78,7 @@ - + system:4,cryo:1,type:3,subtype:3,layer:8,module:11,theta:10 @@ -102,6 +102,10 @@ + + + +