Skip to content

Commit 1c9df71

Browse files
cmsbuildcmsbuild
authored
Merge pull request #49479 from bsunanda/Phase2-gex195
Phase2-gex195 Modify several test scripts in the Simulation packages in view of changing Phase2 scenario default to D121 instead of D110
2 parents 816cee7 + 3883bcb commit 1c9df71

28 files changed

+85
-80
lines changed

‎SimCalorimetry/EcalEBTrigPrimProducers/test/testPhase2_15_0_0.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# Auto generated configuration file
23
# using:
34
# Revision: 1.19
@@ -7,20 +8,20 @@
78

89

910
import FWCore.ParameterSet.Config as cms
10-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
11+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
1112
from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
1213
from Configuration.Eras.Modifier_phase2_ecalTP_devel_cff import phase2_ecalTP_devel
1314

14-
process = cms.Process('DIGI',Phase2C17I13M9,phase2_ecal_devel,phase2_ecalTP_devel)
15+
process = cms.Process('DIGI',Phase2C22I13M9,phase2_ecal_devel,phase2_ecalTP_devel)
1516

1617
# import of standard configurations
1718
process.load('Configuration.StandardSequences.Services_cff')
1819
process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
1920
process.load('FWCore.MessageService.MessageLogger_cfi')
2021
process.load('Configuration.EventContent.EventContent_cff')
2122
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
22-
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
23-
process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff')
23+
process.load('Configuration.Geometry.GeometryExtendedRun4D121Reco_cff')
24+
process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff')
2425
process.load('Configuration.StandardSequences.MagneticField_cff')
2526
process.load('Configuration.StandardSequences.Generator_cff')
2627
process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi')

‎SimG4CMS/Calo/test/python/SimRun4_cfg.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
###############################################################################
22
# Way to use this:
3-
# cmsRun SimRun4_cfg.py geometry=D110 type=DDD data=Muon
3+
# cmsRun SimRun4_cfg.py geometry=D121 type=DDD data=Muon
44
#
5-
# Options for geometry: D110, D120
5+
# Options for geometry: D121, D120
66
# type: DDD, DD4hep
77
# data: Muon, MinBias
88
#
@@ -15,10 +15,10 @@
1515
### SETUP OPTIONS
1616
options = VarParsing.VarParsing('standard')
1717
options.register('geometry',
18-
"D110",
18+
"D121",
1919
VarParsing.VarParsing.multiplicity.singleton,
2020
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: D110, D120")
21+
"geometry of operations: D120, D121")
2222
options.register('type',
2323
"DDD",
2424
VarParsing.VarParsing.multiplicity.singleton,

‎SimG4CMS/Calo/test/python/minbias.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff"
5050
globalTag = "auto:phase1_2022_realistic"
5151
elif (options.geometry == "Run4"):
52-
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
53-
process = cms.Process('Sim',Phase2C11M9)
54-
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D110Reco_cff"
55-
globalTag = "auto:phase2_realistic"
52+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
53+
process = cms.Process('Sim',Phase2C22I13M9)
54+
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D121Reco_cff"
55+
globalTag = "auto:phase2_realistic_T33"
5656
else:
5757
process = cms.Process('Sim')
5858
geomFile = "Configuration.Geometry.GeometryExtendedReco_cff"

‎SimG4CMS/Calo/test/python/minbiasRun4_cfg.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
process = cms.Process("HGCalParametersTest",Phase2C17I13M9)
3737
geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "Reco_cff"
3838
elif (options.type == "V17"):
39-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
40-
process = cms.Process("HGCalParametersTest",Phase2C17I13M9)
41-
geomFile = "Configuration.Geometry.GeometryExtendedRun4D110Reco_cff"
39+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
40+
process = cms.Process("HGCalParametersTest",Phase2C22I13M9)
41+
geomFile = "Configuration.Geometry.GeometryExtendedRun4D121Reco_cff"
4242
else:
4343
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
4444
process = cms.Process("HGCalParametersTest",Phase2C17I13M9)

‎SimG4CMS/Calo/test/python/runHGC7_cfg.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os, sys, importlib, re
33
import FWCore.ParameterSet.VarParsing as VarParsing
44

5-
geomName = "Run4D110"
5+
geomName = "Run4D121"
66
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
77
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
88
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)

‎SimG4CMS/Calo/test/python/runHGC8_cfg.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os, sys, importlib, re
33
import FWCore.ParameterSet.VarParsing as VarParsing
44

5-
geomName = "Run4D110"
5+
geomName = "Run4D121"
66
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
77
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
88
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)

‎SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py‎

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

‎SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
process = cms.Process("HGCalMouseBiteTest",Phase2C17I13M9)
3636
geomFile = "Configuration.Geometry.GeometryExtendedRun4D100_cff"
3737
else:
38-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
39-
process = cms.Process("HGCalMouseBiteTest",Phase2C17I13M9)
40-
geomFile = "Configuration.Geometry.GeometryExtendedRun4D110_cff"
38+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
39+
process = cms.Process("HGCalMouseBiteTest",Phase2C22I13M9)
40+
geomFile = "Configuration.Geometry.GeometryExtendedRun4D121_cff"
4141

4242
print("Geometry file: ", geomFile)
4343

‎SimG4CMS/Calo/test/python/ttbar.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff"
5050
globalTag = "auto:phase1_2022_realistic"
5151
elif (options.geometry == "Run4"):
52-
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
53-
process = cms.Process('Sim',Phase2C11M9)
54-
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D110Reco_cff"
55-
globalTag = "auto:phase2_realistic"
52+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I131M9
53+
process = cms.Process('Sim',Phase2C22I13M9)
54+
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D121Reco_cff"
55+
globalTag = "auto:phase2_realistic_T33"
5656
else:
5757
process = cms.Process('Sim')
5858
geomFile = "Configuration.Geometry.GeometryExtendedReco_cff"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#process.load('Configuration.Geometry.GeometryExtended2015Reco_cff')
66
process.load('Configuration.Geometry.GeometryExtended2017Reco_cff')
77
#process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
8-
#process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
8+
#process.load('Configuration.Geometry.GeometryExtendedRun4D121Reco_cff')
99
#process.load('Configuration.Geometry.GeometryExtendedRun4D108Reco_cff')
1010

1111
from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *
@@ -19,7 +19,7 @@
1919

2020
# Geant4 geometry check
2121
process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("2017")
22-
#process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("Run4D110")
22+
#process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("Run4D121")
2323
process.g4SimHits.G4CheckOverlap.OverlapFlag = cms.bool(False)
2424
process.g4SimHits.G4CheckOverlap.Tolerance = cms.double(0.0)
2525
process.g4SimHits.G4CheckOverlap.Resolution = cms.int32(10000)

0 commit comments

Comments
 (0)