Skip to content

Commit 1dbeb02

Browse files
cmsbuildcmsbuild
authored
Merge pull request #49478 from bsunanda/Phase2-gex194
Phase2-gex194 Modify several test scripts in the Geometry package in view of changing Phase2 scenario default to D121 instead of D110
2 parents 6d71f4b + 19c0bae commit 1dbeb02

File tree

10 files changed

+55
-52
lines changed

10 files changed

+55
-52
lines changed

‎Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Way to use this:
33
# cmsRun runHcalParametersFromDD4HepAnalyzer_cfg.py geometry=Run3
44
#
5-
# Options for geometry Run3, D105, D110
5+
# Options for geometry Run3, D105, D120, D121
66
#
77
###############################################################################
88
import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
1616
"Run3",
1717
VarParsing.VarParsing.multiplicity.singleton,
1818
VarParsing.VarParsing.varType.string,
19-
"geometry of operations: Run3, D105, D110")
19+
"geometry of operations: Run3, D105, D120, D121")
2020

2121
### get and parse the command line arguments
2222
options.parseArguments()
@@ -31,11 +31,16 @@
3131
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
3232
process = cms.Process("HcalParametersTest",Phase2C17I13M9,dd4hep)
3333
process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4D105Reco_cff')
34-
elif (options.geometry == "D110"):
35-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
34+
elif (options.geometry == "D120"):
35+
from Configuration.Eras.Era_Phase2C26I13M9_cff import Phase2C26I13M9
3636
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
37-
process = cms.Process("HcalParametersTest",Phase2C17I13M9,dd4hep)
38-
process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4D110Reco_cff')
37+
process = cms.Process("HcalParametersTest",Phase2C26I13M9,dd4hep)
38+
process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4D120Reco_cff')
39+
elif (options.geometry == "D121"):
40+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
41+
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
42+
process = cms.Process("HcalParametersTest",Phase2C22I13M9,dd4hep)
43+
process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4D121Reco_cff')
3944
else:
4045
from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
4146
process = cms.Process("HcalParametersTest",Run3_dd4hep)

‎Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Way to use this:
33
# cmsRun runHcalParametersFromDDDAnalyzer_cfg.py geometry=Run3
44
#
5-
# Options for geometry Run3, D105, D110
5+
# Options for geometry Run3, D105, D120, D121
66
#
77
###############################################################################
88
import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
1616
"Run3",
1717
VarParsing.VarParsing.multiplicity.singleton,
1818
VarParsing.VarParsing.varType.string,
19-
"geometry of operations: Run3, D105, D110")
19+
"geometry of operations: Run3, D105, D120, D121")
2020

2121
### get and parse the command line arguments
2222
options.parseArguments()
@@ -30,10 +30,14 @@
3030
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3131
process = cms.Process("HcalParametersTest",Phase2C17I13M9)
3232
process.load('Configuration.Geometry.GeometryExtendedRun4D105Reco_cff')
33-
elif (options.geometry == "D110"):
34-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
35-
process = cms.Process("HcalParametersTest",Phase2C17I13M9)
36-
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
33+
elif (options.geometry == "D120"):
34+
from Configuration.Eras.Era_Phase2C26I13M9_cff import Phase2C26I13M9
35+
process = cms.Process("HcalParametersTest",Phase2C26I13M9)
36+
process.load('Configuration.Geometry.GeometryExtendedRun4D120Reco_cff')
37+
elif (options.geometry == "D121"):
38+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
39+
process = cms.Process("HcalParametersTest",Phase2C22I13M9)
40+
process.load('Configuration.Geometry.GeometryExtendedRun4D121Reco_cff')
3741
else:
3842
from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
3943
process = cms.Process("HcalParametersTest",Run3_DDD)

‎Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
print(options)
2424

2525
if (options.geometry == "Phase2"):
26-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
27-
process = cms.Process("HcalSimNumberingTest",Phase2C17I13M9)
28-
process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff')
26+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
27+
process = cms.Process("HcalSimNumberingTest",Phase2C22I13M9)
28+
process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff')
2929
else:
3030
from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
3131
process = cms.Process("HcalSimNumberingTest",Run3_DDD)

‎Geometry/HcalTowerAlgo/test/python/runHcalCellCountRun4_cfg.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#
55
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
66
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
7-
# D114, D115, D116
7+
# D114, D115, D116, D117, D118, D119, D120, D121, D122,
8+
# D123, D124, D125
89
#
910
###############################################################################
1011
import FWCore.ParameterSet.Config as cms
@@ -15,10 +16,10 @@
1516
### SETUP OPTIONS
1617
options = VarParsing.VarParsing('standard')
1718
options.register('geometry',
18-
"D110",
19+
"D121",
1920
VarParsing.VarParsing.multiplicity.singleton,
2021
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116")
22+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119, D120, D121, D122, D123, D124, D125")
2223
### get and parse the command line arguments
2324
options.parseArguments()
2425

@@ -27,8 +28,8 @@
2728
####################################################################
2829
# Use the options
2930

30-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
3131
geomName = "Run4" + options.geometry
32+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
3233

3334
print("Geometry Name: ", geomName)
3435
print("Geom file Name: ", geomFile)

‎Geometry/MTDCommonData/test/testMTDGeometry.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
3+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
44
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
55

6-
process = cms.Process("MTDGeometryTest",Phase2C17I13M9,dd4hep)
6+
process = cms.Process("MTDGeometryTest",Phase2C22I13M9,dd4hep)
77

88
process.source = cms.Source("EmptySource")
99
process.maxEvents = cms.untracked.PSet(
@@ -48,7 +48,7 @@
4848
)
4949

5050
process.load('Configuration.Geometry.GeometryDD4hep_cff')
51-
process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml")
51+
process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D121.xml")
5252

5353
process.DDSpecParRegistryESProducer = cms.ESProducer("DDSpecParRegistryESProducer",
5454
appendToDataLabel = cms.string('')

‎Geometry/MuonCommonData/test/python/g4OverlapCheckGE0_cfg.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Way to use this:
33
# cmsRun g4OverlapCheckGE0_cfg.py geometry=Test tol=0.1
44
#
5-
# Options for geometry Test, D99
5+
# Options for geometry Test, D121
66
#
77
###############################################################################
88
import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
1616
"Test",
1717
VarParsing.VarParsing.multiplicity.singleton,
1818
VarParsing.VarParsing.varType.string,
19-
"geometry of operations: Test, D99")
19+
"geometry of operations: Test, D121")
2020
options.register('tol',
2121
0.1,
2222
VarParsing.VarParsing.multiplicity.singleton,
@@ -32,13 +32,13 @@
3232
####################################################################
3333
# Use the options
3434

35-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
36-
process = cms.Process('OverlapCheck',Phase2C17I13M9)
35+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
36+
process = cms.Process('OverlapCheck',Phase2C22I13M9)
3737

3838
if (options.geometry == "Test"):
3939
geomFile = "Geometry.MuonCommonData.testGE0XML_cfi"
4040
else:
41-
geomFile = "Geometry.MuonCommonData.cmsExtendedGeometryRun4D110XML_cfi"
41+
geomFile = "Geometry.MuonCommonData.cmsExtendedGeometryRun4D121XML_cfi"
4242

4343
baseName = "cmsRun4" + options.geometry + "DDD"
4444

‎Geometry/MuonCommonData/test/python/g4OverlapCheckRun4_cfg.py‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
###############################################################################
22
# Way to use this:
3-
# cmsRun g4OverlapCheck2021_cfg.py type=D110 tol=0.1
3+
# cmsRun g4OverlapCheck2021_cfg.py type=D121 tol=0.1
44
#
5-
# Options for type D110, D116
5+
# Options for type D116, D120, D121
66
# for tol 0.0,0.01, 0.1, 1.0
77
#
88
###############################################################################
@@ -14,10 +14,10 @@
1414
### SETUP OPTIONS
1515
options = VarParsing.VarParsing('standard')
1616
options.register('type',
17-
"D110",
17+
"D121",
1818
VarParsing.VarParsing.multiplicity.singleton,
1919
VarParsing.VarParsing.varType.string,
20-
"geometry of operations: D110, D116")
20+
"geometry of operations: D116, D120, D121")
2121
options.register('tol',
2222
0.0,
2323
VarParsing.VarParsing.multiplicity.singleton,
@@ -32,25 +32,18 @@
3232

3333
####################################################################
3434
# Use the options
35-
geomName = "Geometry.MuonCommonData.testExtendedGeometryRun4" + options.type + "XML_cfi"
35+
geomName = "Run4" + options.type
36+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
3637
baseName = "GeometryExtendedRun4" + options.type + str(options.tol)
3738

38-
print("Geometry file: ", geomName)
39+
print("Geometry file: ", geomFile)
3940
print("Base name: ", baseName)
4041

41-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
42-
process = cms.Process('OverlapCheck',Phase2C17I13M9)
42+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
43+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
44+
process = cms.Process('OverlapCheck',ERA)
4345

44-
process.load(geomName)
45-
process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff")
46-
process.load("SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff")
47-
process.load("Geometry.EcalCommonData.ecalSimulationParameters_cff")
48-
process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cff")
49-
process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
50-
process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
51-
process.load("Geometry.MuonNumbering.muonGeometryConstants_cff")
52-
process.load("Geometry.MuonNumbering.muonOffsetESProducer_cff")
53-
process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff")
46+
process.load(geomFile)
5447
process.load('FWCore.MessageService.MessageLogger_cfi')
5548

5649
from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *

‎Geometry/MuonNumbering/test/testConstantsFromDD4hep_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
process = cms.Process("MuonConstantsTest")
44
process.load("SimGeneral.HepPDTESSource.pdt_cfi")
5-
process.load("Geometry.CMSCommonData.cmsExtendedGeometryRun4D110XML_cfi")
5+
process.load("Geometry.CMSCommonData.cmsExtendedGeometryRun4D121XML_cfi")
66
process.load("Geometry.MuonNumbering.muonGeometryConstants_cff")
77
process.load('FWCore.MessageService.MessageLogger_cfi')
88

99
process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
10-
confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml'),
10+
confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D121.xml'),
1111
appendToDataLabel = cms.string('')
1212
)
1313

‎Geometry/MuonNumbering/test/testConstantsFromDDD_cfg.py‎

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

33
process = cms.Process("MuonConstantsTest")
44
process.load("SimGeneral.HepPDTESSource.pdt_cfi")
5-
process.load("Geometry.CMSCommonData.cmsExtendedGeometryRun4D110XML_cfi")
5+
process.load("Geometry.CMSCommonData.cmsExtendedGeometryRun4D121XML_cfi")
66
process.load("Geometry.MuonNumbering.muonGeometryConstants_cff")
77
process.load('FWCore.MessageService.MessageLogger_cfi')
88

‎Geometry/TrackerCommonData/test/python/dumpTrackerDD4hep_cfg.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
)
2020

2121
process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
22-
confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D110.xml'),
23-
appendToDataLabel = cms.string('DDCMSRun4D110')
22+
confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D121.xml'),
23+
appendToDataLabel = cms.string('DDCMSRun4D121')
2424
)
2525

2626
process.dump = cms.EDAnalyzer("DDTestDumpFile",
27-
outputFileName = cms.untracked.string('cmsRun4D110.root'),
28-
DDDetector = cms.ESInputTag('','DDCMSRun4D110')
27+
outputFileName = cms.untracked.string('cmsRun4D121.root'),
28+
DDDetector = cms.ESInputTag('','DDCMSRun4D121')
2929
)
3030

3131
process.p = cms.Path(process.dump)

0 commit comments

Comments
 (0)