Update some of the geometry cff's of Run2 period

Author: Sunanda

Configuration/Geometry/python/GeometryExtended2016_cff.py

@@ -5,7 +5,9 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2016aXML_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 *

Configuration/Geometry/python/GeometryExtended2016dev_cff.py

@@ -5,7 +5,9 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2016XML_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 *

Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus05Percent_cff.py

@@ -4,8 +4,10 @@
 # 2017 Geometry configuration with tracker material modified by -5%
 #
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_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 *
 

Configuration/Geometry/python/GeometryExtended2017Plan1FlatMinus10Percent_cff.py

@@ -4,8 +4,10 @@
 # 2017 Geometry configuration with tracker material modified by -10%
 #
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_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 *
 

Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus05Percent_cff.py

@@ -4,8 +4,9 @@
 # 2017 Geometry configuration with tracker material modified by +5%
 #
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_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 *

Configuration/Geometry/python/GeometryExtended2017Plan1FlatPlus10Percent_cff.py

@@ -4,8 +4,10 @@
 # 2017 Geometry configuration with tracker material modified by +10%
 #
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_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 *
 

Configuration/Geometry/python/GeometryExtended2017Plan1ZeroMaterial_cff.py

@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1ZeroMaterialXML_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 *
 

Configuration/Geometry/python/GeometryExtended2017Plan1_cff.py

@@ -5,8 +5,9 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2017Plan1XML_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 *

Configuration/Geometry/python/GeometryExtended2017_cff.py

@@ -5,8 +5,10 @@
 #
 # Ideal geometry, needed for simulation
 from Geometry.CMSCommonData.cmsExtendedGeometry2017XML_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 *
 

Configuration/Geometry/python/GeometryExtended2018FlatMinus05Percent_cff.py

@@ -4,8 +4,10 @@
 # 2018 Geometry configuration with tracker material modified by -5%
 #
 from Geometry.CMSCommonData.cmsExtendedGeometry2018FlatMinus05PercentXML_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 *