Skip to content

Commit 9938fac

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48239 from bsunanda/Phase2-hgx364I
Phase2-hgx364I Update the test scripts in SimG4Core/PrintGeomInfo/test/python to accommodate new scenarios of HGCal geometry
2 parents cc7150f + e258638 commit 9938fac

15 files changed

+98
-359
lines changed

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py‎

Lines changed: 16 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Options for geometry 2016, 2017, 2021, Run4D102, Run4D103, Run4D104,
66
# Run4D108, Run4D109, Run4D110, Run4D111, Run4D112,
77
# Run4D113, Run4D114, Run4D115, Run4D116, Run4D117,
8-
# Run4D118, Run4D119, Run4D120
8+
# Run4D118, Run4D119, Run4D120, Run4D122, Run4D123
99
#
1010
###############################################################################
1111
import FWCore.ParameterSet.Config as cms
@@ -19,7 +19,7 @@
1919
"2021",
2020
VarParsing.VarParsing.multiplicity.singleton,
2121
VarParsing.VarParsing.varType.string,
22-
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118, Run4D119, Run4D120")
22+
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118, Run4D119, Run4D120, Run4D122, Run4D123")
2323
options.register('tol',
2424
0.01,
2525
VarParsing.VarParsing.multiplicity.singleton,
@@ -35,87 +35,7 @@
3535
####################################################################
3636
# Use the options
3737

38-
if (options.geometry == "Run4D102"):
39-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
40-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
41-
process.load('Configuration.Geometry.GeometryExtendedRun4D102Reco_cff')
42-
baseName = 'CaloRun4D102'
43-
elif (options.geometry == "Run4D103"):
44-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
45-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
46-
process.load('Configuration.Geometry.GeometryExtendedRun4D103Reco_cff')
47-
baseName = 'CaloRun4D103'
48-
elif (options.geometry == "Run4D104"):
49-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
50-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
51-
process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff')
52-
baseName = 'CaloRun4D104'
53-
elif (options.geometry == "Run4D108"):
54-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
55-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
56-
process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff')
57-
baseName = 'CaloRun4D108'
58-
elif (options.geometry == "Run4D109"):
59-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
60-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
61-
process.load('Configuration.Geometry.GeometryExtendedRun4D109Reco_cff')
62-
baseName = 'CaloRun4D109'
63-
elif (options.geometry == "Run4D110"):
64-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
65-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
66-
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
67-
baseName = 'CaloRun4D110'
68-
elif (options.geometry == "Run4D111"):
69-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
70-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
71-
process.load('Configuration.Geometry.GeometryExtendedRun4D111Reco_cff')
72-
baseName = 'CaloRun4D111'
73-
elif (options.geometry == "Run4D112"):
74-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
75-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
76-
process.load('Configuration.Geometry.GeometryExtendedRun4D112Reco_cff')
77-
baseName = 'CaloRun4D112'
78-
elif (options.geometry == "Run4D113"):
79-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
80-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
81-
process.load('Configuration.Geometry.GeometryExtendedRun4D113Reco_cff')
82-
baseName = 'CaloRun4D113'
83-
elif (options.geometry == "Run4D114"):
84-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
85-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
86-
process.load('Configuration.Geometry.GeometryExtendedRun4D114Reco_cff')
87-
baseName = 'CaloRun4D114'
88-
elif (options.geometry == "Run4D115"):
89-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
90-
process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
91-
process.load('Configuration.Geometry.GeometryExtendedRun4D115Reco_cff')
92-
baseName = 'CaloRun4D115'
93-
elif (options.geometry == "Run4D116"):
94-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
95-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
96-
process.load('Configuration.Geometry.GeometryExtendedRun4D116Reco_cff')
97-
baseName = 'CaloRun4D116'
98-
elif (options.geometry == "Run4D117"):
99-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
100-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
101-
process.load('Configuration.Geometry.GeometryExtendedRun4D117Reco_cff')
102-
baseName = 'CaloRun4D117'
103-
elif (options.geometry == "Run4D118"):
104-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
105-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
106-
process.load('Configuration.Geometry.GeometryExtendedRun4D118Reco_cff')
107-
baseName = 'CaloRun4D118'
108-
elif (options.geometry == "Run4D119"):
109-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
110-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
111-
process.load('Configuration.Geometry.GeometryExtendedRun4D119Reco_cff')
112-
baseName = 'CaloRun4D119'
113-
elif (options.geometry == "Run4D120"):
114-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
115-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
116-
process.load('Configuration.Geometry.GeometryExtendedRun4D120Reco_cff')
117-
baseName = 'CaloRun4D120'
118-
elif (options.geometry == "2016"):
38+
if (options.geometry == "2016"):
11939
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
12040
process = cms.Process('G4PrintGeometry',Run2_2016)
12141
process.load('Configuration.Geometry.GeometryExtended2016Reco_cff')
@@ -125,11 +45,23 @@
12545
process = cms.Process('G4PrintGeometry',Run2_2017)
12646
process.load('Configuration.Geometry.GeometryExtended2017Reco_cff')
12747
baseName = 'Calo2017'
128-
else:
48+
elif (options.geometry == "2021"):
12949
from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
13050
process = cms.Process('G4PrintGeometry',Run3_DDD)
13151
process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
13252
baseName = 'Calo2021'
53+
else:
54+
geomName = options.geometry
55+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
56+
baseName = "Calo" + geomName
57+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
58+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
59+
print("Geometry Name: ", geomName)
60+
print("Geom file Name: ", geomFile)
61+
print("Global Tag Name: ", GLOBAL_TAG)
62+
print("Era Name: ", ERA)
63+
process = cms.Process('G4PrintGeometry',ERA)
64+
process.load(geomFile)
13365

13466
print("Base file Name: ", baseName)
13567

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py‎

Lines changed: 16 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Options for geometry 2016, 2017, 2021, Run4D102, Run4D103, Run4D104,
66
# Run4D108, Run4D109, Run4D110, Run4D111, Run4D112,
77
# Run4D113, Run4D114, Run4D115, Run4D116, Run4D117,
8-
# Run4D118, Run4D119, Run4D120
8+
# Run4D118, Run4D119, Run4D120, Run4D122, Run4D123
99
#
1010
###############################################################################
1111
import FWCore.ParameterSet.Config as cms
@@ -19,7 +19,7 @@
1919
"2021",
2020
VarParsing.VarParsing.multiplicity.singleton,
2121
VarParsing.VarParsing.varType.string,
22-
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118m Run4D119, Run4D120")
22+
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118, Run4D119, Run4D120, Run4D122, Run4D123")
2323
options.register('tol',
2424
0.01,
2525
VarParsing.VarParsing.multiplicity.singleton,
@@ -35,87 +35,7 @@
3535
####################################################################
3636
# Use the options
3737

38-
if (options.geometry == "Run4D102"):
39-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
40-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
41-
process.load('Configuration.Geometry.GeometryExtendedRun4D102Reco_cff')
42-
baseName = 'EcalRun4D102'
43-
elif (options.geometry == "Run4D103"):
44-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
45-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
46-
process.load('Configuration.Geometry.GeometryExtendedRun4D103Reco_cff')
47-
baseName = 'EcalRun4D103'
48-
elif (options.geometry == "Run4D104"):
49-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
50-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
51-
process.load('Configuration.Geometry.GeometryExtendedRun4D104Reco_cff')
52-
baseName = 'EcalRun4D104'
53-
elif (options.geometry == "Run4D108"):
54-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
55-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
56-
process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff')
57-
baseName = 'EcalRun4D108'
58-
elif (options.geometry == "Run4D109"):
59-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
60-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
61-
process.load('Configuration.Geometry.GeometryExtendedRun4D109Reco_cff')
62-
baseName = 'EcalRun4D109'
63-
elif (options.geometry == "Run4D110"):
64-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
65-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
66-
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
67-
baseName = 'EcalRun4D110'
68-
elif (options.geometry == "Run4D111"):
69-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
70-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
71-
process.load('Configuration.Geometry.GeometryExtendedRun4D111Reco_cff')
72-
baseName = 'EcalRun4D111'
73-
elif (options.geometry == "Run4D112"):
74-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
75-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
76-
process.load('Configuration.Geometry.GeometryExtendedRun4D112Reco_cff')
77-
baseName = 'EcalRun4D112'
78-
elif (options.geometry == "Run4D113"):
79-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
80-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
81-
process.load('Configuration.Geometry.GeometryExtendedRun4D113Reco_cff')
82-
baseName = 'EcalRun4D113'
83-
elif (options.geometry == "Run4D114"):
84-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
85-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
86-
process.load('Configuration.Geometry.GeometryExtendedRun4D114Reco_cff')
87-
baseName = 'EcalRun4D114'
88-
elif (options.geometry == "Run4D115"):
89-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
90-
process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
91-
process.load('Configuration.Geometry.GeometryExtendedRun4D115Reco_cff')
92-
baseName = 'EcalRun4D115'
93-
elif (options.geometry == "Run4D116"):
94-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
95-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
96-
process.load('Configuration.Geometry.GeometryExtendedRun4D116Reco_cff')
97-
baseName = 'EcalRun4D116'
98-
elif (options.geometry == "Run4D117"):
99-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
100-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
101-
process.load('Configuration.Geometry.GeometryExtendedRun4D117Reco_cff')
102-
baseName = 'EcalRun4D117'
103-
elif (options.geometry == "Run4D118"):
104-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
105-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
106-
process.load('Configuration.Geometry.GeometryExtendedRun4D118Reco_cff')
107-
baseName = 'EcalRun4D118'
108-
elif (options.geometry == "Run4D119"):
109-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
110-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
111-
process.load('Configuration.Geometry.GeometryExtendedRun4D119Reco_cff')
112-
baseName = 'EcalRun4D119'
113-
elif (options.geometry == "Run4D120"):
114-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
115-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
116-
process.load('Configuration.Geometry.GeometryExtendedRun4D120Reco_cff')
117-
baseName = 'EcalRun4D120'
118-
elif (options.geometry == "2016"):
38+
if (options.geometry == "2016"):
11939
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
12040
process = cms.Process('G4PrintGeometry',Run2_2016)
12141
process.load('Configuration.Geometry.GeometryExtended2016Reco_cff')
@@ -125,11 +45,23 @@
12545
process = cms.Process('G4PrintGeometry',Run2_2017)
12646
process.load('Configuration.Geometry.GeometryExtended2017Reco_cff')
12747
baseName = 'Ecal2017'
128-
else:
48+
elif (options.geometry == "2021"):
12949
from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
13050
process = cms.Process('G4PrintGeometry',Run3_DDD)
13151
process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
13252
baseName = 'Ecal2021'
53+
else:
54+
geomName = options.geometry
55+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
56+
baseName = "Ecal" + geomName
57+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
58+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
59+
print("Geometry Name: ", geomName)
60+
print("Geom file Name: ", geomFile)
61+
print("Global Tag Name: ", GLOBAL_TAG)
62+
print("Era Name: ", ERA)
63+
process = cms.Process('G4PrintGeometry',ERA)
64+
process.load(geomFile)
13365

13466
print("Base file Name: ", baseName)
13567

0 commit comments

Comments
 (0)