Skip to content

Commit 71d954e

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47380 from bsunanda/Run3-gex187F
Run3-gex187F Update the remaining scriptts in Configuration/Geometry for Calorimeter and Muon systems
2 parents e65a5fe + 56f1456 commit 71d954e

12 files changed

+37
-12
lines changed

‎Configuration/Geometry/python/GeometryIdeal2015_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#
66
# Ideal geometry, needed for simulation
77
from Geometry.CMSCommonData.cmsIdealGeometry2015XML_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
1010
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
11+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
1112
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
13+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1214

‎Configuration/Geometry/python/GeometryIdeal2015dev_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#
66
# Ideal geometry, needed for simulation
77
from Geometry.CMSCommonData.cmsIdealGeometry2015devXML_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
1010
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
11+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
1112
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
13+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1214

‎Configuration/Geometry/python/GeometryIdealAPD1_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Ideal geometry, needed for simulation
77
from Geometry.CMSCommonData.cmsIdealGeometryAPD1XML_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
# Reconstruction geometry services
1010
# Tracking Geometry
1111
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
@@ -17,6 +17,7 @@
1717
#Muon
1818
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
1919
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
20+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
2021
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
2122

2223
# Alignment
@@ -32,3 +33,4 @@
3233
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
3334
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
3435
from Geometry.HcalCommonData.hcalDDConstants_cff import *
36+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *

‎Configuration/Geometry/python/GeometryIdealNoAPD_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Ideal geometry, needed for simulation
77
from Geometry.CMSCommonData.cmsIdealGeometryNoAPDXML_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
# Reconstruction geometry services
1010
# Tracking Geometry
1111
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
@@ -17,6 +17,7 @@
1717
#Muon
1818
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
1919
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
20+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
2021
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
2122

2223
# Alignment
@@ -32,3 +33,4 @@
3233
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
3334
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
3435
from Geometry.HcalCommonData.hcalDDConstants_cff import *
36+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *

‎Configuration/Geometry/python/GeometryIdeal_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
#
66
# Ideal geometry, needed for simulation
77
from Geometry.CMSCommonData.cmsIdealGeometryXML_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
1010
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
11+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
1112
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
13+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1214

1315
# Reconstruction geometry services
1416
from Configuration.Geometry.GeometryReco_cff import *

‎Configuration/Geometry/python/GeometryNoCastor_cff.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Ideal geometry, needed for simulation
77
from Geometry.CMSCommonData.cmsNoCastorGeometryXML_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
# Reconstruction geometry services
1010
# Tracking Geometry
1111
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
@@ -16,6 +16,7 @@
1616

1717
#Muon
1818
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
19+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1920
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
2021
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
2122

@@ -30,3 +31,6 @@
3031
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
3132
from Geometry.EcalMapping.EcalMapping_cfi import *
3233
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
34+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
35+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
36+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *

‎Configuration/Geometry/python/GeometrySLHCReco_cff.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
# Reconstruction geometry services
66
# Tracking Geometry
77
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
8-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
8+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
99
trackerGeometry.applyAlignment = cms.bool(False)
1010

1111
#Tracker
1212
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
1313
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
1414

1515
#Muon
16+
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
17+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1618
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
1719
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
1820

@@ -30,6 +32,9 @@
3032
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
3133
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
3234
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
35+
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
36+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
37+
from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
3338

3439
## Just in case if a wrong DB record is pulled in:
3540
##

‎Configuration/Geometry/python/GeometrySLHCSimIdeal_cff.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
# Ideal geometry, needed for simulation
44
from SLHCUpgradeSimulations.Geometry.Phase1_R30F12_cmsSimIdealGeometryXML_cff import *
5-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
5+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *

‎Configuration/Geometry/python/GeometrySimAll_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Ideal geometry, needed for simulation
44
from Geometry.CMSCommonData.cmsAllGeometryXML_cfi import *
5-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
5+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
66
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
77
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
8+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
89
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
10+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

‎Configuration/Geometry/python/GeometrySimIdealGFlash_cff.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
# Ideal geometry, needed for simulation
44
from Geometry.CMSCommonData.cmsIdealGeometryGFlashXML_cfi import *
5-
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
5+
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
66
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
77
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
8+
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
89
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
10+
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
911

0 commit comments

Comments
 (0)