Merge pull request #47375 from bsunanda/Run3-gex187E

cmsbuild · web-flow · commit 45b48b298e55 · 2025-02-18T08:11:39.000+01:00
Run3-gex187E Update several geometry scripts for misc. Extended scenarios
diff --git a/Configuration/Geometry/python/GeometryExtended2015CastorMeasured_cff.py b/Configuration/Geometry/python/GeometryExtended2015CastorMeasured_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015CastorMeasuredXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015CastorSystMinus_cff.py b/Configuration/Geometry/python/GeometryExtended2015CastorSystMinus_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015CastorSystMinusXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015CastorSystPlus_cff.py b/Configuration/Geometry/python/GeometryExtended2015CastorSystPlus_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015CastorSystPlusXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015FlatMinus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2015FlatMinus05Percent_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatMinus05PercentXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015FlatMinus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2015FlatMinus10Percent_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatMinus10PercentXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015FlatPlus05Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2015FlatPlus05Percent_cff.py
@@ -5,7 +5,9 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatPlus05PercentXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015FlatPlus10Percent_cff.py b/Configuration/Geometry/python/GeometryExtended2015FlatPlus10Percent_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatPlus10PercentXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015MuonGEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py
@@ -11,5 +11,7 @@
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi 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/GeometryExtended2015ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryExtended2015ZeroMaterial_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015ZeroMaterialXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015_cff.py b/Configuration/Geometry/python/GeometryExtended2015_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2015dev_cff.py b/Configuration/Geometry/python/GeometryExtended2015dev_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015devXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2016_CTPPS_cff.py b/Configuration/Geometry/python/GeometryExtended2016_CTPPS_cff.py
@@ -5,7 +5,9 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2016aXML_CTPPS_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2017DDD_cff.py b/Configuration/Geometry/python/GeometryExtended2017DDD_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2017DDDXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2017Plan0_cff.py b/Configuration/Geometry/python/GeometryExtended2017Plan0_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan0XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2017_CTPPS_cff.py b/Configuration/Geometry/python/GeometryExtended2017_CTPPS_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2017XML_CTPPS_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2018DDD_cff.py b/Configuration/Geometry/python/GeometryExtended2018DDD_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2018DDDXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2018DetailedCavern_cff.py b/Configuration/Geometry/python/GeometryExtended2018DetailedCavern_cff.py
@@ -5,9 +5,11 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometryDetailedCavern2018XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2018NoSD_cff.py b/Configuration/Geometry/python/GeometryExtended2018NoSD_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal 2018 geometry with no SD declaration
 from Geometry.CMSCommonData.cmsExtendedGeometry2018NoSDXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2018Plan0_cff.py_cff.py b/Configuration/Geometry/python/GeometryExtended2018Plan0_cff.py_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2018Plan0XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2018Plan36_cff.py b/Configuration/Geometry/python/GeometryExtended2018Plan36_cff.py
@@ -5,8 +5,9 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2018Plan36XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2018_CTPPS_cff.py b/Configuration/Geometry/python/GeometryExtended2018_CTPPS_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2018XML_CTPPS_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended2019_cff.py b/Configuration/Geometry/python/GeometryExtended2019_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtendedCastorMeasured2015dev_cff.py b/Configuration/Geometry/python/GeometryExtendedCastorMeasured2015dev_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015devCastorMeasuredXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtendedCastorSystMinus2015dev_cff.py b/Configuration/Geometry/python/GeometryExtendedCastorSystMinus2015dev_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015devCastorSystMinusXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtendedCastorSystPlus2015dev_cff.py b/Configuration/Geometry/python/GeometryExtendedCastorSystPlus2015dev_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2015devCastorSystPlusXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtendedGFlash_cff.py b/Configuration/Geometry/python/GeometryExtendedGFlash_cff.py
@@ -5,10 +5,12 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometryGFlashXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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 *
 
 # Reconstruction geometry services
 from Configuration.Geometry.GeometryReco_cff import *
diff --git a/Configuration/Geometry/python/GeometryExtendedHFLibraryNoCastor_cff.py b/Configuration/Geometry/python/GeometryExtendedHFLibraryNoCastor_cff.py
@@ -5,7 +5,9 @@
 #
 # Ideal geometry, needed for simulation 
 from Geometry.CMSCommonData.cmsExtendedGeometryHFLibraryNoCastorXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtendedTest2014_cff.py b/Configuration/Geometry/python/GeometryExtendedTest2014_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometryTest2014XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtendedZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryExtendedZeroMaterial_cff.py
@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometryZeroMaterialXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+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/GeometryExtended_cff.py b/Configuration/Geometry/python/GeometryExtended_cff.py
@@ -8,10 +8,11 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometryXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
 # TrackerAdditionalParametersPerDet contains only default values, needed for consistency with Phase 2
 from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi 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 *
