Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Phase2-hgx316F Modify the validation test scripts to accommodate the new geometry of HGCal (D93) #38587

Merged
merged 1 commit into from
Jul 8, 2022
Merged

Phase2-hgx316F Modify the validation test scripts to accommodate the new geometry of HGCal (D93) #38587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun protoHGCalSimWatcher_cfg.py geometry=D77
#
# Options for geometry D49, D68, D77, D83, D84, D88, D92
# Options for geometry D49, D68, D77, D83, D84, D88, D92, D93
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,7 +16,7 @@
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D49, D68, D84, D77, D83, D88, D92")
"geometry of operations: D49, D68, D84, D77, D83, D88, D92, D93")

### get and parse the command line arguments
options.parseArguments()
Expand Down Expand Up @@ -68,6 +68,13 @@
process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
fileCheck = 'testHGCalSimWatcherV17.root'
runMode = 1
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
process = cms.Process('PROD',Phase2C11)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
fileCheck = 'testHGCalSimWatcherV17N.root'
runMode = 1
else:
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
Expand Down
13 changes: 11 additions & 2 deletions Validation/HGCalValidation/test/python/protoSimValid_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun protoSimValid_cfg.py geometry=D77 type=hgcalBHValidation
#
# Options for geometry D49, D68, D77, D83, D84, D88, D92
# Options for geometry D49, D68, D77, D83, D84, D88, D92, D93
# type hgcalBHValidation, hgcalSiliconValidation
#
###############################################################################
Expand All @@ -17,7 +17,7 @@
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D49, D68, D77, D83, D84, D88, D92")
"geometry of operations: D49, D68, D77, D83, D84, D88, D92, D93")
options.register ('type',
"hgcalBHValidation",
VarParsing.VarParsing.multiplicity.singleton,
Expand Down Expand Up @@ -86,6 +86,15 @@
fileName = 'hgcSilValidD92.root'
else:
fileName = 'hgcBHValidD92.root'
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
process = cms.Process('PROD',Phase2C11)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
if (options.type == "hgcalSiliconValidation"):
fileName = 'hgcSilValidD93.root'
else:
fileName = 'hgcBHValidD93.root'
else:
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
Expand Down
23 changes: 21 additions & 2 deletions Validation/HGCalValidation/test/python/protoValid_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun protoValid_cfg.py geometry=D77 type=hgcalSimHitStudy defaultInput=1
#
# Options for geometry D49, D68, D77, D83, D84, D88, D92
# Options for geometry D49, D68, D77, D83, D84, D88, D92, D93
# type hgcalGeomCheck, hgcalSimHitStudy, hgcalDigiStudy,
# hgcalRecHitStudy, hgcalSiliconValidation
# defaultInput 1, 0
Expand All @@ -19,7 +19,7 @@
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D49, D68, D77, D83, D84, D88, D92")
"geometry of operations: D49, D68, D77, D83, D84, D88, D92, D93")
options.register('type',
"hgcalGeomCheck",
VarParsing.VarParsing.multiplicity.singleton,
Expand Down Expand Up @@ -153,6 +153,25 @@
fileName = 'hgcSilValidD92.root'
else:
fileName = 'hgcGeomCheckD92.root'
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
process = cms.Process('PROD',Phase2C11)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
fileCheck = 'testHGCalSimWatcherV17.root'
if (options.type == "hgcalSimHitStudy"):
fileName = 'hgcSimHitD93.root'
elif (options.type == "hgcalDigiStudy"):
fileName = 'hgcDigiD93.root'
elif (options.type == "hgcalRecHitStudy"):
fileName = 'hgcRecHitD93.root'
elif (options.type == "hgcalSiliconValidation"):
if (options.defaultInput == 0):
fileName = 'hgcDigValidD93.root'
else:
fileName = 'hgcSilValidD93.root'
else:
fileName = 'hgcGeomCheckD93.root'
else:
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
Expand Down
13 changes: 10 additions & 3 deletions Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun runHGCGeomCheck_cfg.py geometry=D77
#
# Options for geometry D49, D68, D77, D83, D84, D88, D92
# Options for geometry D49, D68, D77, D83, D84, D88, D92, D93
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -13,10 +13,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D86",
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D49, D68, D84, D77, D83, D88, D92")
"geometry of operations: D49, D68, D84, D77, D83, D88, D92, D93")

### get and parse the command line arguments
options.parseArguments()
Expand Down Expand Up @@ -68,6 +68,13 @@
process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
inFile = 'file:testHGCalSimWatcherV17.root'
outFile = 'hgcGeomCheckD92.root'
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
inFile = 'file:testHGCalSimWatcherV17N.root'
outFile = 'hgcGeomCheckD93.root'
else:
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
Expand Down
11 changes: 9 additions & 2 deletions Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun runHGCalDigiStudy_cfg.py geometry=D88
#
# Options for geometry D77, D83, D88, D92
# Options for geometry D77, D83, D88, D92, D93
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,7 +16,7 @@
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D77, D83, D88, D92")
"geometry of operations: D77, D83, D88, D92, D93")

### get and parse the command line arguments
options.parseArguments()
Expand Down Expand Up @@ -47,6 +47,13 @@
process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
fileInput = 'file:step2D92tt.root'
fileName = 'hgcDigiD92tt.root'
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
fileInput = 'file:step2D93tt.root'
fileName = 'hgcDigiD93tt.root'
else:
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
process = cms.Process('PROD',Phase2C11)
Expand Down
11 changes: 9 additions & 2 deletions Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun runHGCalRecHitStudy_cfg.py geometry=D82
#
# Options for geometry D77, D83, D88, D92
# Options for geometry D77, D83, D88, D92, D93
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,7 +16,7 @@
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D77, D83, D88, D92")
"geometry of operations: D77, D83, D88, D92, D93")

### get and parse the command line arguments
options.parseArguments()
Expand Down Expand Up @@ -47,6 +47,13 @@
process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
fileInput = 'file:step3D92tt.root'
fileName = 'hgcRecHitD92tt.root'
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
fileInput = 'file:step3D93tt.root'
fileName = 'hgcRecHitD93tt.root'
else:
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
process = cms.Process('PROD',Phase2C11)
Expand Down
25 changes: 16 additions & 9 deletions Validation/HGCalValidation/test/python/runHGCalSimHitStudy_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun runHGCalSimHitStudy_cfg.py geometry=D92
#
# Options for geometry D77, D83, D88, D92
# Options for geometry D77, D83, D88, D92, D93
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,7 +16,7 @@
"D88",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D77, D83, D88, D92")
"geometry of operations: D77, D83, D88, D92, D93")

### get and parse the command line arguments
options.parseArguments()
Expand All @@ -31,29 +31,36 @@
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D83_cff')
process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff')
fileInput = 'file:step1D83tt.root'
fileName = 'hgcSimHitD83tt.root'
fileInput = 'file:step1.root'
fileName = 'hgcSimHitD83.root'
elif (options.geometry == "D88"):
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D88_cff')
process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
fileInput = 'file:step1D88tt.root'
fileInput = 'file:step1.root'
fileName = 'hgcSimHitD88tt.root'
elif (options.geometry == "D92"):
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D92_cff')
process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
fileInput = 'file:step1D92tt.root'
fileName = 'hgcSimHitD92tt.root'
fileInput = 'file:step1.root'
fileName = 'hgcSimHitD92.root'
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
process = cms.Process('PROD',Phase2C11M9)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
fileInput = 'file:step1.root'
fileName = 'hgcSimHitD93.root'
else:
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
process = cms.Process('PROD',Phase2C11)
process.load('Configuration.Geometry.GeometryExtended2026D77_cff')
process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
fileInput = 'file:step1D77tt.root'
fileName = 'hgcSimHitD77tt.root'
fileInput = 'file:step1.root'
fileName = 'hgcSimHitD77.root'

print("Input file: ", fileInput)
print("Output file: ", fileName)
Expand Down
7 changes: 3 additions & 4 deletions Validation/HGCalValidation/test/python/runHGCalWaferHitCheck_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9
process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9)
#process.load('Configuration.Geometry.GeometryExtended2026D77_cff')
#process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
#process.load('Configuration.Geometry.GeometryExtended2026D83_cff')
#process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff')
process.load('Configuration.Geometry.GeometryExtended2026D86_cff')
process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
#process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
#process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')

process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
process.load("Configuration.StandardSequences.MagneticField_cff")
Expand Down
7 changes: 6 additions & 1 deletion Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Way to use this:
# cmsRun runHGCalWaferStudy_cfg.py geometry=D88
#
# Options for geometry D49, D68, D77, D83, D84, D88, D92
# Options for geometry D49, D68, D77, D83, D84, D88, D92, D93
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand Down Expand Up @@ -63,6 +63,11 @@
process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9)
process.load('Configuration.Geometry.GeometryExtended2026D92_cff')
process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
elif (options.geometry == "D93"):
from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9
process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9)
process.load('Configuration.Geometry.GeometryExtended2026D93_cff')
process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
else:
from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9
process = cms.Process('HGCGeomAnalysis',Phase2C11I13M9)
Expand Down
Loading