Skip to content

Commit 5c9085d

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47103 from bsunanda/Phase2-hgx361C
Phase2-hgx361C Update the remaining test scripts i Validation/HGCalValidation.test/python with the new tool that finds the right ERA and Global tag for a Phase2 scenario
2 parents 47e6d18 + b8c2c60 commit 5c9085d

File tree

3 files changed

+34
-59
lines changed

3 files changed

+34
-59
lines changed

‎Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py‎

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

3-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
3+
geomName = "Run4D115"
4+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
5+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
6+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
7+
print("Geometry Name: ", geomName)
8+
print("Geom file Name: ", geomFile)
9+
print("Global Tag Name: ", GLOBAL_TAG)
10+
print("Era Name: ", ERA)
411

5-
process = cms.Process('SIM',Phase2C20I13M9)
12+
process = cms.Process('HFNoseSimHitStudy',ERA)
613

714
# import of standard configurations
815
process.load('Configuration.StandardSequences.Services_cff')
916
process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
1017
process.load('FWCore.MessageService.MessageLogger_cfi')
1118
process.load('Configuration.EventContent.EventContent_cff')
1219
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
13-
process.load('Configuration.Geometry.GeometryExtendedRun4D115Reco_cff')
20+
process.load(geomFile)
1421
process.load('Configuration.StandardSequences.MagneticField_cff')
1522
process.load('Configuration.StandardSequences.Generator_cff')
1623
process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi')
@@ -91,7 +98,7 @@
9198
# Other statements
9299
process.genstepfilter.triggerConditions=cms.vstring("generation_step")
93100
from Configuration.AlCa.GlobalTag import GlobalTag
94-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
101+
process.GlobalTag = GlobalTag(process.GlobalTag, GLOBAL_TAG, '')
95102

96103
process.generator = cms.EDProducer("FlatRandomEGunProducer",
97104
PGunParameters = cms.PSet(

‎Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,19 @@
2626

2727
####################################################################
2828
# Use the options
29-
if (options.geometry == "D115"):
30-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
31-
process = cms.Process('BHValid',Phase2C20I13M9)
32-
elif (options.geometry == "D104"):
33-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
34-
process = cms.Process('BHValid',PhaseC22I13M9)
35-
elif (options.geometry == "D106"):
36-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
37-
process = cms.Process('BHValid',PhaseC22I13M9)
38-
elif (options.geometry == "D109"):
39-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
40-
process = cms.Process('BHValid',PhaseC22I13M9)
41-
elif (options.geometry == "D111"):
42-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
43-
process = cms.Process('BHValid',PhaseC22I13M9)
44-
elif (options.geometry == "D112"):
45-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
46-
process = cms.Process('BHValid',PhaseC22I13M9)
47-
elif (options.geometry == "D113"):
48-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
49-
process = cms.Process('BHValid',PhaseC22I13M9)
50-
else:
51-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
52-
process = cms.Process('BHValid',Phase2C17I13M9)
53-
54-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
29+
30+
geomName = "Run4" + options.geometry
31+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
32+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
33+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
5534
fileName = "hgcBHValid" + options.geometry + ".root"
35+
print("Geometry Name: ", geomName)
36+
print("Geom file Name: ", geomFile)
37+
print("Global Tag Name: ", GLOBAL_TAG)
38+
print("Era Name: ", ERA)
39+
print("Output file: ", fileName)
5640

57-
print("Geometry file: ", geomFile)
58-
print("Output file: ", fileName)
41+
process = cms.Process('BHValid',ERA)
5942

6043
# import of standard configurations
6144
process.load(geomFile)
@@ -117,7 +100,7 @@
117100
# Other statements
118101
process.genstepfilter.triggerConditions=cms.vstring("generation_step")
119102
from Configuration.AlCa.GlobalTag import GlobalTag
120-
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
103+
process.GlobalTag = GlobalTag(process.GlobalTag, GLOBAL_TAG, '')
121104

122105
process.generator = cms.EDProducer("FlatRandomPtGunProducer",
123106
PGunParameters = cms.PSet(

‎Validation/HGCalValidation/test/python/testHGCalWaferValidation_cfg.py‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,23 @@
2525

2626
####################################################################
2727
# Use the options
28-
if (options.geometry == "D115"):
29-
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
30-
process = cms.Process('WaferValidation',Phase2C20I13M9)
31-
elif (options.geometry == "D104"):
32-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
33-
process = cms.Process('WaferValidation',PhaseC22I13M9)
34-
elif (options.geometry == "D106"):
35-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
36-
process = cms.Process('WaferValidation',PhaseC22I13M9)
37-
elif (options.geometry == "D109"):
38-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
39-
process = cms.Process('WaferValidation',PhaseC22I13M9)
40-
elif (options.geometry == "D111"):
41-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
42-
process = cms.Process('WaferValidation',PhaseC22I13M9)
43-
elif (options.geometry == "D112"):
44-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
45-
process = cms.Process('WaferValidation',PhaseC22I13M9)
46-
elif (options.geometry == "D113"):
47-
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
48-
process = cms.Process('WaferValidation',PhaseC22I13M9)
49-
else:
50-
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
51-
process = cms.Process('WaferValidation',Phase2C17I13M9)
5228

53-
geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
29+
geomName = "Run4" + options.geometry
30+
geomFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
31+
import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
32+
GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
33+
print("Geometry Name: ", geomName)
34+
print("Geom file Name: ", geomFile)
35+
print("Global Tag Name: ", GLOBAL_TAG)
36+
print("Era Name: ", ERA)
37+
38+
process = cms.Process('WaferValidation',ERA)
39+
5440
if (options.geometry == "D98"):
5541
fileName = 'Validation/HGCalValidation/data/geomnew_corrected_360_V1.txt'
5642
else:
5743
fileName = 'Validation/HGCalValidation/data/geomnew_corrected_360_V2.txt'
5844

59-
print("Geometry file: ", geomFile)
6045
print("File Name: ", fileName)
6146

6247
process.load(geomFile)

0 commit comments

Comments
 (0)