From 43a27055ad2f0f649a40c77ca26291ff27d0ff5e Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 8 Oct 2024 21:09:58 +0200 Subject: [PATCH 1/4] Update the scenarios for providing the correct set of initializing cfis -- backport of #46310 --- .../Geometry/python/GeometryDD4hepExtended2017Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2018Reco_cff.py | 1 + .../GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2021Reco_cff.py | 1 + .../python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py | 1 + .../GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2023Reco_cff.py | 1 + .../python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py | 1 + .../GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py | 1 + .../GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2024Reco_cff.py | 1 + .../python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py | 1 + .../python/GeometryDD4hepExtended2026DefaultReco_cff.py | 4 +++- .../Geometry/python/GeometryDD4hepExtended2026Default_cff.py | 4 +++- .../python/GeometryExtended2021FlatMinus05PercentReco_cff.py | 1 + .../python/GeometryExtended2021FlatMinus10PercentReco_cff.py | 1 + .../python/GeometryExtended2021FlatPlus05PercentReco_cff.py | 1 + .../python/GeometryExtended2021FlatPlus10PercentReco_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2021Reco_cff.py | 1 + .../python/GeometryExtended2021ZeroMaterialReco_cff.py | 1 + .../python/GeometryExtended2023FlatMinus05PercentReco_cff.py | 1 + .../python/GeometryExtended2023FlatMinus10PercentReco_cff.py | 1 + .../python/GeometryExtended2023FlatPlus05PercentReco_cff.py | 1 + .../python/GeometryExtended2023FlatPlus10PercentReco_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2023Reco_cff.py | 1 + .../python/GeometryExtended2023ZeroMaterialReco_cff.py | 1 + .../python/GeometryExtended2024FlatMinus05PercentReco_cff.py | 1 + .../python/GeometryExtended2024FlatMinus10PercentReco_cff.py | 1 + .../python/GeometryExtended2024FlatPlus05PercentReco_cff.py | 1 + .../python/GeometryExtended2024FlatPlus10PercentReco_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2024Reco_cff.py | 1 + .../python/GeometryExtended2024ZeroMaterialReco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D100Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D101Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D102Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D103Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D104Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D105Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D106Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D107Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D108Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D109Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D110Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D111Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D112Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D113Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D114Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D115Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D95Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D96Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D98Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026D99Reco_cff.py | 1 + .../Geometry/python/GeometryExtended2026DefaultReco_cff.py | 4 +++- .../Geometry/python/GeometryExtended2026Default_cff.py | 4 +++- Configuration/Geometry/python/GeometryReco_cff.py | 2 ++ Configuration/Geometry/python/dict2021Geometry.py | 4 +++- Configuration/Geometry/python/dict2026Geometry.py | 1 + 85 files changed, 96 insertions(+), 5 deletions(-) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py index 39c0d9ceae60d..f993840b7da44 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2017Reco_cff.py @@ -26,4 +26,5 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py index 022d54b8556bc..dea0c50da8f60 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2018Reco_cff.py @@ -26,4 +26,5 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py index 3cc9ae3004e21..f33e5b2978ac4 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py index 53fdfe55fdf7f..d0d9b569476fe 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py index 898420b813bc8..e10749efb6e2b 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py index ac606c5857577..ec66c1611d193 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py index bb0eed90f8e97..f287acbdaebaa 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py index 2b687c4b806f1..5d0069b2434a1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py index e787c6240a938..7eaa8f41cfe16 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py index 41e4a10f3c253..c6c785ae3d7be 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py index c45437fe8d538..405cf2411d1d1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py index 6fb4dd7c4b014..85ea9cd5232af 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py index c6a55e498eb2d..19f9c23ffe421 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py index 830bec2e788d5..b8b007b4a6214 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py index 54764550594ca..a71c0e17547fb 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py index 48db2746a8d7d..0fe59cab20b6c 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py index 644966d65cfbf..0a6795ceeb87f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py index fbd53296d75b5..edc5f0e645521 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py index 153ed59caf792..8d8fb5306c9a9 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py index c9d164632b795..7539034105c6e 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py index 4242b8b9cfe07..1fb5096f5c83e 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D100Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py index a6386d7d64394..94745c5f3a113 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D101Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py index 75eeef05b39e5..ee1ed6634c223 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D102Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py index ad3ace932168b..daca1e59cebd3 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D103Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py index f121208ca4c7d..abc0b5b68853d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D104Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py index a88460198c5e9..9a9b642cc0e7b 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D105Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py index 4ee9c26644d4b..7f3847aae79a0 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D106Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py index 8264b81610aed..0ae25ae4d9168 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D107Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py index b8ada9d263bfe..afaa9cab3da10 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D108Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py index cd71616f80067..15b5b5bb12f47 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D109Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py index d25f31b7f2dc6..9c897d92a5501 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D110Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py index 0f39b095b2a5a..da19f297ba36c 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D111Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py index cffbce755d683..d538f1ac22139 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D112Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py index 566958b5a83af..544cdfda2841f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D113Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py index 2c6c6a499ab17..ca5c1c5d012d4 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D114Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py index bdcad354c9faf..68ab49124feae 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D115Reco_cff.py @@ -50,6 +50,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py index ffbd37300d2ef..6e8a1df4691d2 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py index 7044c6cfcc25d..7823384af01a8 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py index 2a2a1a1c1fada..8ec7600cb6ba0 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py index a94cab656d651..cac36be8033ac 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py index b72dc7405148f..c7bfaec544dd1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff import * +reco_dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}Reco_cff import *" +exec(reco_dd4hep_geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py index 6600d3ddd2b6e..6edff18cef641 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryDD4hepExtended2026D110_cff import * +dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}_cff import *" +exec(dd4hep_geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py index c98b17ff1dce4..9c03e2e92a35b 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py index 0d20e27f047ab..dea0c3f082780 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py index ca96a5b16ec9b..7d0a5552b038f 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py index 14a33b3afc6f8..1e16b6eaa31b4 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py index f573869340ef1..6e7ef029fccaa 100644 --- a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py index 31be348f0238c..7e4ad02936259 100644 --- a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py index 283c604c27a30..9b8ce0ee9525d 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py index 55e793ecc6982..8d91d68005d44 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py index aedcdbb6bb6e7..127fb68c6f199 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py index ef0a8f48dd663..9efe05d070f5c 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py index 5cbb0c59ed92e..02ae5b824b18f 100644 --- a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py index c41c147c59a1f..415f346adfd0e 100644 --- a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py index 4f8cb8f4e2676..99b200605842c 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py index 868956931f67f..1c3cb755f764b 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py index a7b56137a72c5..7c1cff15c7897 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py index bb2ea252b58e9..14e333e221165 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py index a68716611eaf4..d0b0542f1e36d 100644 --- a/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py index cadf24129fca0..9dc84dccbf36e 100644 --- a/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py @@ -31,6 +31,7 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py index 0181649198193..cb5dfd51d2f65 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D100Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py index fd27ef456b9fe..f6ab84a3adbb8 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D101Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py index 9bfaebd4fcd2a..0920f3ba0a7c9 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D102Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py index ffe6a3befd70a..7999287b21b02 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D103Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py index 84a889d36e957..d1cfbf24e261c 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D104Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D105Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D105Reco_cff.py index 4b19889fe4f81..814938b68f110 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D105Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D105Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D106Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D106Reco_cff.py index 5f5682495a9ff..d8346d2ac1ea9 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D106Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D106Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D107Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D107Reco_cff.py index 364ddb0134a2a..4b82c552f245b 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D107Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D107Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D108Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D108Reco_cff.py index 8a5d664c71474..20e9a72c2860a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D108Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D108Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D109Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D109Reco_cff.py index cdf7970be15e6..2fdd4236d5228 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D109Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D109Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py index 58d2bcb09eff9..fbe4d56d6a7ab 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D110Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D111Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D111Reco_cff.py index 28f1fcaf7acfa..26ebcb225e70c 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D111Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D111Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D112Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D112Reco_cff.py index fdd85814a28d0..61fe9282b447c 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D112Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D112Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D113Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D113Reco_cff.py index 7c7b2e5ed1e44..ebb04a34ec4c2 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D113Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D113Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D114Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D114Reco_cff.py index 4a541c7833940..54b0964fea2a2 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D114Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D114Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D115Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D115Reco_cff.py index 3dac19b791a99..218dd943172d0 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D115Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D115Reco_cff.py @@ -50,6 +50,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py index 96b87f413d155..c099632c44944 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py index e642a47c6434f..f0f03e13c38ab 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py index bdccdab1a30dc..b26a480b042ac 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py index 241752d0d3e68..e75bb5089385d 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py @@ -47,6 +47,7 @@ from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * # forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ZdcGeometry_cfi import * # timing diff --git a/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py index 176c3f8d63020..b757a900c5960 100644 --- a/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryExtended2026D110Reco_cff import * +reco_geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{DEFAULT_VERSION}Reco_cff import *" +exec(reco_geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryExtended2026Default_cff.py index 8f26a0828bfc6..cfb9f0a23fd6a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026Default_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026Default_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryExtended2026D110_cff import * +geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{DEFAULT_VERSION}_cff import *" +exec(geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryReco_cff.py b/Configuration/Geometry/python/GeometryReco_cff.py index b4d5a14599dfe..6c8ff67e59af6 100644 --- a/Configuration/Geometry/python/GeometryReco_cff.py +++ b/Configuration/Geometry/python/GeometryReco_cff.py @@ -29,3 +29,5 @@ from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDConstants_cff import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * +from Geometry.ForwardGeometry.ForwardGeometry_cfi import * diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index d486e020f8c77..b62cdfaaac10b 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -1382,6 +1382,7 @@ 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', + 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', 'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *', 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', 'from Geometry.EcalMapping.EcalMapping_cfi import *', @@ -1450,6 +1451,7 @@ 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', + 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', 'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *', 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', 'from Geometry.EcalMapping.EcalMapping_cfi import *', @@ -1729,7 +1731,7 @@ 'Geometry/ForwardCommonData/data/zdcrotations.xml', 'Geometry/ForwardCommonData/data/lumirotations.xml', 'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml', - 'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml', + 'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml', ], 3 : [ diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index d3205b1a8c031..649d52d65fe73 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -1237,6 +1237,7 @@ 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', ], "reco" :[ + 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', 'from Geometry.ForwardGeometry.ZdcGeometry_cfi import *', ] }, From 0eea215a10b1407162c27b3d77426d00ef1b299c Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 9 Oct 2024 08:25:56 +0200 Subject: [PATCH 2/4] Incomplete transfer --- Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml | 2 +- Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml | 2 +- Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py | 2 +- Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml index 5a90998ff598f..65794f5b4b878 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml @@ -262,7 +262,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml index f730196058283..683bd1cdc3eee 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml @@ -262,7 +262,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py index ff7c945632d86..cfae683a4f282 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py @@ -265,7 +265,7 @@ 'Geometry/ForwardCommonData/data/zdcrotations.xml', 'Geometry/ForwardCommonData/data/lumirotations.xml', 'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml', - 'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml', + 'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml', 'Geometry/VeryForwardData/data/RP_Box.xml', 'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py index 710e52bb52dca..c1f10dc1a645c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py @@ -265,7 +265,7 @@ 'Geometry/ForwardCommonData/data/zdcrotations.xml', 'Geometry/ForwardCommonData/data/lumirotations.xml', 'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml', - 'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml', + 'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml', 'Geometry/VeryForwardData/data/RP_Box.xml', 'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml', From 9b227c10f253fff05668acb26ff001b108a867f0 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 9 Oct 2024 14:14:32 +0200 Subject: [PATCH 3/4] Add missing cfis --- Configuration/Geometry/python/GeometryExtended2021_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2023_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2024_cff.py | 1 + 3 files changed, 3 insertions(+) diff --git a/Configuration/Geometry/python/GeometryExtended2021_cff.py b/Configuration/Geometry/python/GeometryExtended2021_cff.py index 9de9be7fd18e5..6a1359bcbd200 100644 --- a/Configuration/Geometry/python/GeometryExtended2021_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023_cff.py b/Configuration/Geometry/python/GeometryExtended2023_cff.py index b8af3ab3857be..42bf75cff279e 100644 --- a/Configuration/Geometry/python/GeometryExtended2023_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2024_cff.py b/Configuration/Geometry/python/GeometryExtended2024_cff.py index faa7346259acf..01f5c0255f47f 100644 --- a/Configuration/Geometry/python/GeometryExtended2024_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * From 90b117304f9e3d096ea7089acefbdd4be2b11034 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 9 Oct 2024 14:25:55 +0200 Subject: [PATCH 4/4] Add missing cfis --- .../GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2021FlatMinus05Percent_cff.py | 1 + .../GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2021FlatMinus10Percent_cff.py | 1 + .../GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py | 1 - .../python/GeometryDD4hepExtended2021FlatPlus05Percent_cff.py | 1 + .../GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryDD4hepExtended2021FlatPlus10Percent_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2021Reco_cff.py | 1 - .../python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py | 1 - .../python/GeometryDD4hepExtended2021ZeroMaterial_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2021_cff.py | 1 + .../GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2023FlatMinus05Percent_cff.py | 1 + .../GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2023FlatMinus10Percent_cff.py | 1 + .../GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py | 1 - .../python/GeometryDD4hepExtended2023FlatPlus05Percent_cff.py | 1 + .../GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryDD4hepExtended2023FlatPlus10Percent_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2023Reco_cff.py | 1 - .../python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py | 1 - .../python/GeometryDD4hepExtended2023ZeroMaterial_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2023_cff.py | 1 + .../GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2024FlatMinus05Percent_cff.py | 1 + .../GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py | 1 - .../GeometryDD4hepExtended2024FlatMinus10Percent_cff.py | 1 + .../GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py | 1 - .../python/GeometryDD4hepExtended2024FlatPlus05Percent_cff.py | 1 + .../GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryDD4hepExtended2024FlatPlus10Percent_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2024Reco_cff.py | 1 - .../python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py | 1 - .../python/GeometryDD4hepExtended2024ZeroMaterial_cff.py | 1 + .../Geometry/python/GeometryDD4hepExtended2024_cff.py | 1 + .../python/GeometryExtended2021FlatMinus05PercentReco_cff.py | 1 - .../python/GeometryExtended2021FlatMinus05Percent_cff.py | 1 + .../python/GeometryExtended2021FlatMinus10PercentReco_cff.py | 1 - .../python/GeometryExtended2021FlatMinus10Percent_cff.py | 1 + .../python/GeometryExtended2021FlatPlus05PercentReco_cff.py | 1 - .../python/GeometryExtended2021FlatPlus05Percent_cff.py | 1 + .../python/GeometryExtended2021FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryExtended2021FlatPlus10Percent_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2021Reco_cff.py | 1 - .../python/GeometryExtended2021ZeroMaterialReco_cff.py | 1 - .../Geometry/python/GeometryExtended2021ZeroMaterial_cff.py | 1 + .../python/GeometryExtended2023FlatMinus05PercentReco_cff.py | 1 - .../python/GeometryExtended2023FlatMinus05Percent_cff.py | 1 + .../python/GeometryExtended2023FlatMinus10PercentReco_cff.py | 1 - .../python/GeometryExtended2023FlatMinus10Percent_cff.py | 1 + .../python/GeometryExtended2023FlatPlus05PercentReco_cff.py | 1 - .../python/GeometryExtended2023FlatPlus05Percent_cff.py | 1 + .../python/GeometryExtended2023FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryExtended2023FlatPlus10Percent_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2023Reco_cff.py | 1 - .../python/GeometryExtended2023ZeroMaterialReco_cff.py | 1 - .../Geometry/python/GeometryExtended2023ZeroMaterial_cff.py | 1 + .../python/GeometryExtended2024FlatMinus05PercentReco_cff.py | 1 - .../python/GeometryExtended2024FlatMinus05Percent_cff.py | 1 + .../python/GeometryExtended2024FlatMinus10PercentReco_cff.py | 1 - .../python/GeometryExtended2024FlatMinus10Percent_cff.py | 1 + .../python/GeometryExtended2024FlatPlus05PercentReco_cff.py | 1 - .../python/GeometryExtended2024FlatPlus05Percent_cff.py | 1 + .../python/GeometryExtended2024FlatPlus10PercentReco_cff.py | 1 - .../python/GeometryExtended2024FlatPlus10Percent_cff.py | 1 + Configuration/Geometry/python/GeometryExtended2024Reco_cff.py | 1 - .../python/GeometryExtended2024ZeroMaterialReco_cff.py | 1 - .../Geometry/python/GeometryExtended2024ZeroMaterial_cff.py | 1 + Configuration/Geometry/python/dict2021Geometry.py | 4 ++-- 70 files changed, 35 insertions(+), 38 deletions(-) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py index f33e5b2978ac4..3cc9ae3004e21 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05Percent_cff.py index 80a97e64cbfcb..0b5a7f1330dc0 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py index d0d9b569476fe..53fdfe55fdf7f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10Percent_cff.py index e61adc7b57a64..1d050fcf6e31a 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py index e10749efb6e2b..898420b813bc8 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05Percent_cff.py index ee5a8f375f1eb..a13d83eb46369 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py index ec66c1611d193..ac606c5857577 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10Percent_cff.py index 2f79141d07e3d..e8a418b12a248 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py index f287acbdaebaa..bb0eed90f8e97 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py index 5d0069b2434a1..2b687c4b806f1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py index b8d15296c85c0..e150f64186ded 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py index 9946653ac914a..0be2a24c63cae 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py index 7eaa8f41cfe16..e787c6240a938 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05Percent_cff.py index 1a4e774ad04ff..94ae433216681 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus05Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py index c6c785ae3d7be..41e4a10f3c253 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10Percent_cff.py index df1d78180e1b7..d92e72d2cd5f1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatMinus10Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py index 405cf2411d1d1..c45437fe8d538 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05Percent_cff.py index b3dff449104dc..1685f2c8771ca 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus05Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py index 85ea9cd5232af..6fb4dd7c4b014 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10Percent_cff.py index df9479c2f0e6b..94b7bcd6cd26f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023FlatPlus10Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py index 19f9c23ffe421..c6a55e498eb2d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023Reco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py index b8b007b4a6214..830bec2e788d5 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterialReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterial_cff.py index 7d3beebb9abf5..c51d11056ef3f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterial_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023ZeroMaterial_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2023_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2023_cff.py index 93a0faa946d80..8555b355134bc 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2023_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2023_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py index a71c0e17547fb..54764550594ca 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05Percent_cff.py index cd3d0fc1cff68..b5fc6147d254f 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus05Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py index 0fe59cab20b6c..48db2746a8d7d 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10Percent_cff.py index d5fd6d18aeb55..fbbc7493689b6 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatMinus10Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py index 0a6795ceeb87f..644966d65cfbf 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05Percent_cff.py index 9cb3b2164a16a..395c6e91df63a 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus05Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py index edc5f0e645521..fbd53296d75b5 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10Percent_cff.py index ed103136d84f3..bccf97c7f725b 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024FlatPlus10Percent_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py index 8d8fb5306c9a9..153ed59caf792 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024Reco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py index 7539034105c6e..c9d164632b795 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterialReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterial_cff.py index 2019b242dfa18..e19dec1f998cb 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterial_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024ZeroMaterial_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2024_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2024_cff.py index e3386d5e79177..3e680cc0ec2ce 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2024_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2024_cff.py @@ -9,6 +9,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py index 9c03e2e92a35b..c98b17ff1dce4 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05Percent_cff.py index ac204a484c471..925554acbfbba 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus05Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py index dea0c3f082780..0d20e27f047ab 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10Percent_cff.py index 63e3f88b9141c..a78376e8829e8 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatMinus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatMinus10Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py index 7d0a5552b038f..ca96a5b16ec9b 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05Percent_cff.py index 7238ea157a7b5..b203903e3171a 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus05Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py index 1e16b6eaa31b4..14a33b3afc6f8 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10Percent_cff.py index a5bd0128b335d..72259002ff6b5 100644 --- a/Configuration/Geometry/python/GeometryExtended2021FlatPlus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021FlatPlus10Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py index 6e7ef029fccaa..f573869340ef1 100644 --- a/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py index 7e4ad02936259..31be348f0238c 100644 --- a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterial_cff.py index d04903b81cb33..9ecd65b785b8c 100644 --- a/Configuration/Geometry/python/GeometryExtended2021ZeroMaterial_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021ZeroMaterial_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py index 9b8ce0ee9525d..283c604c27a30 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05Percent_cff.py index 8fb47f4d40810..0592fa922a20f 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus05Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py index 8d91d68005d44..55e793ecc6982 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10Percent_cff.py index 68b3151c6dd22..304ea84cc6732 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatMinus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatMinus10Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py index 127fb68c6f199..aedcdbb6bb6e7 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05Percent_cff.py index 3c4394e3b1f5c..2b7436898addb 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus05Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py index 9efe05d070f5c..ef0a8f48dd663 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10Percent_cff.py index 0ee56c6ce1422..0cf49ba92c260 100644 --- a/Configuration/Geometry/python/GeometryExtended2023FlatPlus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023FlatPlus10Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py index 02ae5b824b18f..5cbb0c59ed92e 100644 --- a/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023Reco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py index 415f346adfd0e..c41c147c59a1f 100644 --- a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterialReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterial_cff.py index c7773be6e68b7..32917530e8f3a 100644 --- a/Configuration/Geometry/python/GeometryExtended2023ZeroMaterial_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2023ZeroMaterial_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py index 99b200605842c..4f8cb8f4e2676 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatMinus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatMinus05Percent_cff.py index 6c97628ceb78e..db6aaeb9d5706 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatMinus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatMinus05Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py index 1c3cb755f764b..868956931f67f 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatMinus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatMinus10Percent_cff.py index 450a52be233ce..31cc7dff87ce5 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatMinus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatMinus10Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py index 7c1cff15c7897..a7b56137a72c5 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatPlus05PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatPlus05Percent_cff.py index e4417fccb7b73..4a8926681a485 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatPlus05Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatPlus05Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py index 14e333e221165..bb2ea252b58e9 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatPlus10PercentReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2024FlatPlus10Percent_cff.py index 0b4cb22f9d7bd..56b71707ac341 100644 --- a/Configuration/Geometry/python/GeometryExtended2024FlatPlus10Percent_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024FlatPlus10Percent_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py index d0b0542f1e36d..a68716611eaf4 100644 --- a/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024Reco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py b/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py index 9dc84dccbf36e..cadf24129fca0 100644 --- a/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024ZeroMaterialReco_cff.py @@ -31,7 +31,6 @@ from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.ForwardGeometry.ForwardGeometry_cfi import * from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * from Geometry.EcalMapping.EcalMapping_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2024ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryExtended2024ZeroMaterial_cff.py index ddb758aba76cf..ae1b021735752 100644 --- a/Configuration/Geometry/python/GeometryExtended2024ZeroMaterial_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2024ZeroMaterial_cff.py @@ -7,6 +7,7 @@ from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * from Geometry.MuonNumbering.muonGeometryConstants_cff import * from Geometry.MuonNumbering.muonOffsetESProducer_cff import * diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index b62cdfaaac10b..6f9a5272e05ae 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -1363,6 +1363,7 @@ "sim" : [ 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', + 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', ], "reco" : [ 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', @@ -1382,7 +1383,6 @@ 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', - 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', 'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *', 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', 'from Geometry.EcalMapping.EcalMapping_cfi import *', @@ -1432,6 +1432,7 @@ "sim" : [ 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', + 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', ], "reco" : [ 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', @@ -1451,7 +1452,6 @@ 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', - 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', 'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *', 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', 'from Geometry.EcalMapping.EcalMapping_cfi import *',