Skip to content

Commit 84033b4

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47112 from bsunanda/Phase2-hgx361D
Phase2-hgx361D Simplify the scripts in SimG4Core/PrintGeomInfo/test/python by using a new tool that finds th right ERA and Global Tag
2 parents a9eb3f0 + b870e3f commit 84033b4

13 files changed

+157
-378
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,18 @@
3232
####################################################################
3333
# Use the options
3434

35-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
36-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
37-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
35+
geomName = "Run4" + options.geometry
36+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
37+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
38+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
3839
baseName = "HGCalRun4" + options.geometry
40+
print("Geometry Name: ", geomName)
41+
print("Geom file Name: ", geomFile)
42+
print("Global Tag Name: ", GLOBAL_TAG)
43+
print("Era Name: ", ERA)
44+
print("Base file Name: ", baseName)
3945

40-
print("Geometry file Name: ", geomFile)
41-
print("Base file Name: ", baseName)
46+
process = cms.Process('G4PrintGeometry',ERA)
4247

4348
process.load(geomFile)
4449
from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *
@@ -69,5 +74,3 @@
6974
process.g4SimHits.FileNameGDML = ''
7075
process.g4SimHits.FileNameRegions = ''
7176
#
72-
73-
#process.load('Geometry.HGCalCommonData.testHGCalV10XML_cfi')

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,18 @@
3232
####################################################################
3333
# Use the options
3434

35-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
36-
process = cms.Process('OverlapCheck',Phase2C20I13M9)
35+
geomName = "Run4" + options.geometry
36+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
37+
baseName = "cms" + geomName + "DDD"
38+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
39+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
40+
print("Geometry Name: ", geomName)
41+
print("Geom file Name: ", geomFile)
42+
print("Base file Name: ", baseName)
43+
print("Global Tag Name: ", GLOBAL_TAG)
44+
print("Era Name: ", ERA)
3745

38-
39-
baseName = "cmsRun4" + options.geometry + "DDD"
40-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
41-
42-
43-
print("Geometry file Name: ", geomFile)
44-
print("Base file Name: ", baseName)
46+
process = cms.Process('OverlapCheck',ERA)
4547

4648
process.load('FWCore.MessageService.MessageLogger_cfi')
4749

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
####################################################################
3535
# Use the options
3636

37-
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
38-
if (options.geometry == "D115"):
39-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
40-
process = cms.Process('OverlapCheck',Phase2C20I13M9,dd4hep)
41-
else:
42-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
43-
process = cms.Process('OverlapCheck',Phase2C17I13M9,dd4hep)
44-
45-
geomFile = "Configuration.Geometry.GeometryDD4hepExtendedRun4" + options.geometry + "Reco_cff"
46-
baseName = "cmsRun4" + options.geometry + "DD4hep"
37+
geomName = "Run4" + options.geometry
38+
geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + geomName + "Reco_cff"
39+
baseName = "cms" + geomName + "DD4hep"
40+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
41+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
42+
print("Geometry Name: ", geomName)
43+
print("Geom file Name: ", geomFile)
44+
print("Base file Name: ", baseName)
45+
print("Global Tag Name: ", GLOBAL_TAG)
46+
print("Era Name: ", ERA)
4747

48-
print("Geometry file Name: ", geomFile)
49-
print("Base file Name: ", baseName)
48+
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
49+
process = cms.Process('OverlapCheck',ERA,dd4hep)
5050

5151
process.load(geomFile)
5252
process.load('FWCore.MessageService.MessageLogger_cfi')

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434
####################################################################
3535
# Use the options
3636

37-
if (options.geometry == "D115"):
38-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
39-
process = cms.Process('OverlapCheck',Phase2C20I13M9)
40-
else:
41-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
42-
process = cms.Process('OverlapCheck',Phase2C17I13M9)
37+
geomName = "Run4" + options.geometry
38+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
39+
baseName = "cms" + geomName + "DDD"
40+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
41+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
42+
print("Geometry Name: ", geomName)
43+
print("Geom file Name: ", geomFile)
44+
print("Base file Name: ", baseName)
45+
print("Global Tag Name: ", GLOBAL_TAG)
46+
print("Era Name: ", ERA)
4347

44-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
45-
baseName = "cmsRun4" + options.geometry + "DDD"
46-
47-
print("Geometry file Name: ", geomFile)
48-
print("Base file Name: ", baseName)
48+
process = cms.Process('OverlapCheck',ERA)
4949

5050
process.load(geomFile)
5151
process.load('FWCore.MessageService.MessageLogger_cfi')

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,25 @@
2828
####################################################################
2929
# Use the options
3030

31+
geomName = "Run4" + options.geometry
32+
geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + geomName + "Reco_cff"
33+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
34+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
35+
print("Geometry Name: ", geomName)
36+
print("Geom file Name: ", geomFile)
37+
print("Global Tag Name: ", GLOBAL_TAG)
38+
print("Era Name: ", ERA)
39+
3140
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
32-
if (options.geometry == "D115"):
33-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
34-
process = cms.Process('G4PrintGeometry',Phase2C20I13M9,dd4hep)
35-
else:
36-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
37-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9,dd4hep)
41+
process = cms.Process('G4PrintGeometry',ERA,dd4hep)
3842

39-
geomFile = "Configuration.Geometry.GeometryDD4hepExtendedRun4" + options.geometry + "Reco_cff"
4043
materialFileName = "matfile" + options.geometry + "DD4hep.txt"
4144
solidFileName = "solidfile" + options.geometry + "DD4hep.txt"
4245
lvFileName = "lvfile" + options.geometry + "DD4hep.txt"
4346
pvFileName = "pvfile" + options.geometry + "DD4hep.txt"
4447
touchFileName = "touchfile" + options.geometry + "DD4hep.txt"
4548
regionFileName = "regionfile" + options.geometry + "DD4hep.txt"
4649

47-
print("Geometry file Name: ", geomFile)
4850
print("Material file Name: ", materialFileName)
4951
print("Solid file Name: ", solidFileName)
5052
print("LV file Name: ", lvFileName)

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,24 @@
2828
####################################################################
2929
# Use the options
3030

31-
if (options.geometry == "D115"):
32-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
33-
process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
34-
else:
35-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
36-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
31+
geomName = "Run4" + options.geometry
32+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
33+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
34+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
35+
print("Geometry Name: ", geomName)
36+
print("Geom file Name: ", geomFile)
37+
print("Global Tag Name: ", GLOBAL_TAG)
38+
print("Era Name: ", ERA)
39+
40+
process = cms.Process('G4PrintGeometry',ERA)
3741

38-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
3942
materialFileName = "matfile" + options.geometry + "DDD.txt"
4043
solidFileName = "solidfile" + options.geometry + "DDD.txt"
4144
lvFileName = "lvfile" + options.geometry + "DDD.txt"
4245
pvFileName = "pvfile" + options.geometry + "DDD.txt"
4346
touchFileName = "touchfile" + options.geometry + "DDD.txt"
4447
regionFileName = "regionfile" + options.geometry + "DDD.txt"
4548

46-
print("Geometry file Name: ", geomFile)
4749
print("Material file Name: ", materialFileName)
4850
print("Solid file Name: ", solidFileName)
4951
print("LV file Name: ", lvFileName)

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

Lines changed: 13 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -38,61 +38,20 @@
3838
#####p###############################################################
3939
# Use the options
4040

41-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
42-
43-
if (options.geometry == "D115"):
44-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
45-
if (options.type == "DD4hep"):
46-
process = cms.Process('G4PrintGeometry',Phase2C20I13M9,dd4hep)
47-
else:
48-
process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
49-
elif (options.geometry == "D104"):
50-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
51-
if (options.type == "DD4hep"):
52-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9,dd4hep)
53-
else:
54-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
55-
elif (options.geometry == "D106"):
56-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
57-
if (options.type == "DD4hep"):
58-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9,dd4hep)
59-
else:
60-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
61-
elif (options.geometry == "D109"):
62-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
63-
if (options.type == "DD4hep"):
64-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9,dd4hep)
65-
else:
66-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
67-
elif (options.geometry == "D111"):
68-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
69-
if (options.type == "DD4hep"):
70-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9,dd4hep)
71-
else:
72-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
73-
elif (options.geometry == "D112"):
74-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
75-
if (options.type == "DD4hep"):
76-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9,dd4hep)
77-
else:
78-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
79-
elif (options.geometry == "D113"):
80-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
81-
if (options.type == "DD4hep"):
82-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9,dd4hep)
83-
else:
84-
process = cms.Process('G4PrintGeometry',Phase2C22I13M9)
41+
geomName = "Run4" + options.geometry
42+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
43+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
44+
print("Geometry Name: ", geomName)
45+
print("Global Tag Name: ", GLOBAL_TAG)
46+
print("Era Name: ", ERA)
47+
48+
if (options.type == "DD4hep"):
49+
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
50+
process = cms.Process('G4PrintGeometry',ERA,dd4hep)
51+
geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + geomName + "Reco_cff"
8552
else:
86-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
87-
if (options.type == "DD4hep"):
88-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9,dd4hep)
89-
else:
90-
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
91-
92-
if (options.type == "DDD"):
93-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
94-
else:
95-
geomFile = "Configuration.Geometry.GeometryDD4hepExtendedRun4" + options.geometry + "Reco_cff"
53+
process = cms.Process('G4PrintGeometry',ERA)
54+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
9655

9756
print("Geometry file Name: ", geomFile)
9857
print("Detector : ", options.detector)

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

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@
3333

3434
####################################################################
3535
# Use the options
36-
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
36+
37+
geomName = "Run4" + options.geometry
38+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
39+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
40+
print("Geometry Name: ", geomName)
41+
print("Global Tag Name: ", GLOBAL_TAG)
42+
print("Era Name: ", ERA)
3743

3844
if (options.type == "DD4hep"):
39-
geomFile = "Configuration.Geometry.GeometryDD4hepExtendedRun4" + options.geometry + "Reco_cff"
40-
if (options.geometry == "D115"):
41-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
42-
process = cms.Process('PrintG4Solids',Phase2C20I13M9,dd4hep)
43-
else:
44-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
45-
process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep)
45+
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
46+
process = cms.Process('G4PrintGeometry',ERA,dd4hep)
47+
geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + geomName + "Reco_cff"
48+
dd4hep = True
4649
else:
47-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
48-
if (options.geometry == "D115"):
49-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
50-
process = cms.Process('PrintG4Solids',Phase2C20I13M9)
51-
else:
52-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
53-
process = cms.Process('PrintG4Solids',Phase2C17I13M9)
50+
process = cms.Process('G4PrintGeometry',ERA)
51+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
52+
dd4hep = False
5453

5554
print("Geometry file Name: ", geomFile)
55+
print("dd4hep Flag: ", dd4hep)
5656

5757
process.load(geomFile)
5858
process.load('FWCore.MessageService.MessageLogger_cfi')
@@ -95,11 +95,6 @@
9595
process.g4SimHits.Physics.DefaultCutValue = 10.
9696
process.g4SimHits.LHCTransport = False
9797

98-
if (options.type == "DD4hep"):
99-
dd4hep = True
100-
else:
101-
dd4hep = False
102-
10398
process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
10499
dd4hep = cms.untracked.bool(dd4hep),
105100
dumpVolumes = cms.untracked.vstring(),

0 commit comments

Comments
 (0)