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.

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

Phase2-hgx359A Modify some of the scripts in Validation/HGCalValidation/test/python to be in line with the current defaults of scenarios #45437

Merged
merged 1 commit into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions Validation/HGCalValidation/test/python/digiClient_cfg.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###############################################################################
# Way to use this:
# cmsRun digiClient_cfg.py geometry=D99
# cmsRun digiClient_cfg.py geometry=D110
#
# Options for geometry D98, D99, D108, D94, D103, D104, D106, D107, D108,
# D109, D110, D111, D112, D113
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -13,10 +13,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D99",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D98, D99, D108, D94, D103, D104, D106, D107, D108, D109, D110, D111, D112, D113")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")

### get and parse the command line arguments
options.parseArguments()
Expand All @@ -26,7 +26,7 @@
####################################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('Client',Phase2C20I13M9)
elif (options.geometry == "D104"):
Expand All @@ -38,6 +38,15 @@
elif (options.geometry == "D109"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D111"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D112"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D113"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('Client',Phase2C17I13M9)
Expand Down
37 changes: 23 additions & 14 deletions Validation/HGCalValidation/test/python/digiValidation_cfg.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###############################################################################
# Way to use this:
# cmsRun digiValidation_cfg.py geometry=D99
# cmsRun digiValidation_cfg.py geometry=D110
#
# Options for geometry D98, D99, D108, D94, D103, D104, D106, D107, D108
# D109, D110, D111, D112, D113
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -14,10 +14,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D99",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D98, D99, D108, D94, D103, D104, D106, D107, D108, D109, D110, D111, D112, D113")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")

### get and parse the command line arguments
options.parseArguments()
Expand All @@ -27,18 +27,27 @@
####################################################################
# Use the options

if (options.geometry == "D94"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('DigiValidation',Phase2C20I13M9)
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('Client',Phase2C20I13M9)
elif (options.geometry == "D104"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('DigiValidation',PhaseC22I13M9)
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D106"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('DigiValidation',PhaseC22I13M9)
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D109"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('DigiValidation',PhaseC22I13M9)
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D111"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D112"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D113"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('DigiValidation',Phase2C17I13M9)
Expand Down
29 changes: 19 additions & 10 deletions Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###############################################################################
# Way to use this:
# cmsRun protoHGCalSimWatcher_cfg.py geometry=D99
# cmsRun protoHGCalSimWatcher_cfg.py geometry=D110
#
# Options for geometry D98, D99, D108, D94, D103, D104, D106, D107, D108,
# D109, D110, D111, D112, D113
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -14,10 +14,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D99",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D98, D99, D108, D94, D103, D104, D106, D107, D108, D109, D110, D111, D112, D113")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")

### get and parse the command line arguments
options.parseArguments()
Expand All @@ -27,18 +27,27 @@
####################################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('PROD',Phase2C20I13M9)
process = cms.Process('Client',Phase2C20I13M9)
elif (options.geometry == "D104"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D106"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D109"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D111"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D112"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D113"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('PROD',Phase2C17I13M9)
Expand Down
29 changes: 19 additions & 10 deletions Validation/HGCalValidation/test/python/protoSimValid_cfg.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###############################################################################
# Way to use this:
# cmsRun protoSimValid_cfg.py geometry=D99 type=hgcalBHValidation
# cmsRun protoSimValid_cfg.py geometry=D110 type=hgcalBHValidation
#
# Options for geometry D98, D99, D108, D94, D103, D104, D106, D107, D108,
# D109, D110, D111, D112, D113
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
# type hgcalBHValidation, hgcalSiliconValidation
#
###############################################################################
Expand All @@ -15,10 +15,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D99",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D98, D99, D108, D94, D103, D104, D106, D107, D108, D109, D110, D111, D112, D113")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
options.register ('type',
"hgcalBHValidation",
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -33,18 +33,27 @@
############################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('PROD',Phase2C20I13M9)
process = cms.Process('Client',Phase2C20I13M9)
elif (options.geometry == "D104"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D106"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D109"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D111"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D112"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D113"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('PROD',Phase2C17I13M9)
Expand Down
29 changes: 19 additions & 10 deletions Validation/HGCalValidation/test/python/protoValid_cfg.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###############################################################################
# Way to use this:
# cmsRun protoValid_cfg.py geometry=D99 type=hgcalSimHitStudy defaultInput=1
# cmsRun protoValid_cfg.py geometry=D110 type=hgcalSimHitStudy defaultInput=1
#
# Options for geometry D98, D99, D108, D94, D103, D104, D106, D107, D108,
# D109, D110, D111, D112, D113
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
# type hgcalGeomCheck, hgcalSimHitStudy, hgcalDigiStudy,
# hgcalRecHitStudy, hgcalSiliconValidation
# defaultInput 1, 0
Expand All @@ -17,10 +17,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D99",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D98, D99, D108, D94, D103, D104, D106, D107, D108, D109, D110, D111, D112, D113")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
options.register('type',
"hgcalGeomCheck",
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -40,18 +40,27 @@
############################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('PROD',Phase2C20I13M9)
process = cms.Process('Client',Phase2C20I13M9)
elif (options.geometry == "D104"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D106"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D109"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('PROD',PhaseC22I13M9)
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D111"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D112"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D113"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('PROD',Phase2C17I13M9)
Expand Down
21 changes: 15 additions & 6 deletions Validation/HGCalValidation/test/python/recHitClient_cfg.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###############################################################################
# Way to use this:
# cmsRun recHitClient_cfg.py geometry=D99
# cmsRun recHitClient_cfg.py geometry=D110
#
# Options for geometry D98, D99, D108, D94, D103, D104, D106, D107, D108,
# D109, D110, D111, D112, D113
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -14,10 +14,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D99",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D98, D99, D108, D94, D103, D104, D106, D107, D108, D109, D110, D111, D112, D113")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")

### get and parse the command line arguments
options.parseArguments()
Expand All @@ -27,7 +27,7 @@
####################################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('Client',Phase2C20I13M9)
elif (options.geometry == "D104"):
Expand All @@ -39,6 +39,15 @@
elif (options.geometry == "D109"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D111"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D112"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
elif (options.geometry == "D113"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process('Client',PhaseC22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process('Client',Phase2C17I13M9)
Expand Down
Loading