diff --git a/Validation/HGCalValidation/test/python/digiClient_cfg.py b/Validation/HGCalValidation/test/python/digiClient_cfg.py index 3bbd23ba25e87..559044e5bbc4f 100644 --- a/Validation/HGCalValidation/test/python/digiClient_cfg.py +++ b/Validation/HGCalValidation/test/python/digiClient_cfg.py @@ -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 @@ -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() @@ -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"): @@ -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) diff --git a/Validation/HGCalValidation/test/python/digiValidation_cfg.py b/Validation/HGCalValidation/test/python/digiValidation_cfg.py index b281f3cdfe46d..83fcf6b91a4a3 100644 --- a/Validation/HGCalValidation/test/python/digiValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/digiValidation_cfg.py @@ -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 @@ -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() @@ -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) diff --git a/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py b/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py index bbd840b22c7b1..fa984d60c461e 100644 --- a/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py +++ b/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py @@ -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 @@ -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() @@ -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) diff --git a/Validation/HGCalValidation/test/python/protoSimValid_cfg.py b/Validation/HGCalValidation/test/python/protoSimValid_cfg.py index 3e3e58df70105..08ea3d55ddaa4 100644 --- a/Validation/HGCalValidation/test/python/protoSimValid_cfg.py +++ b/Validation/HGCalValidation/test/python/protoSimValid_cfg.py @@ -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 # ############################################################################### @@ -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, @@ -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) diff --git a/Validation/HGCalValidation/test/python/protoValid_cfg.py b/Validation/HGCalValidation/test/python/protoValid_cfg.py index f3b77313e6c0b..095f198292d3f 100644 --- a/Validation/HGCalValidation/test/python/protoValid_cfg.py +++ b/Validation/HGCalValidation/test/python/protoValid_cfg.py @@ -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 @@ -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, @@ -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) diff --git a/Validation/HGCalValidation/test/python/recHitClient_cfg.py b/Validation/HGCalValidation/test/python/recHitClient_cfg.py index 5e958721d787a..599d769ce842e 100644 --- a/Validation/HGCalValidation/test/python/recHitClient_cfg.py +++ b/Validation/HGCalValidation/test/python/recHitClient_cfg.py @@ -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 @@ -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() @@ -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"): @@ -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) diff --git a/Validation/HGCalValidation/test/python/rechitValidation_cfg.py b/Validation/HGCalValidation/test/python/rechitValidation_cfg.py index 1c9fa4cafb9e1..8cda9de35e64f 100644 --- a/Validation/HGCalValidation/test/python/rechitValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/rechitValidation_cfg.py @@ -1,9 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun rechitValidation_cfg.py geometry=D99 +# cmsRun rechitValidation_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 @@ -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() @@ -26,18 +26,27 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 - process = cms.Process('HGCalRecHitLocal',Phase2C20I13M9) + process = cms.Process('Client',Phase2C20I13M9) elif (options.geometry == "D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('HGCalRecHitLocal',PhaseC22I13M9) + process = cms.Process('Client',PhaseC22I13M9) elif (options.geometry == "D106"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('HGCalRecHitLocal',PhaseC22I13M9) + process = cms.Process('Client',PhaseC22I13M9) elif (options.geometry == "D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('HGCalRecHitLocal',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('HGCalRecHitLocal',Phase2C17I13M9) diff --git a/Validation/HGCalValidation/test/python/simHitClient_cfg.py b/Validation/HGCalValidation/test/python/simHitClient_cfg.py index 75c8e108a0873..7f387be5852a4 100644 --- a/Validation/HGCalValidation/test/python/simHitClient_cfg.py +++ b/Validation/HGCalValidation/test/python/simHitClient_cfg.py @@ -1,9 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun simHitClient_cfg.py geometry=D99 +# cmsRun simHitClient_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 @@ -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() @@ -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"): @@ -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) diff --git a/Validation/HGCalValidation/test/python/simHitValidation_cfg.py b/Validation/HGCalValidation/test/python/simHitValidation_cfg.py index 1fe8b88da91d8..4eb47eb59ec9f 100644 --- a/Validation/HGCalValidation/test/python/simHitValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/simHitValidation_cfg.py @@ -1,9 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun simHitValidation_cfg.py geometry=D99 +# cmsRun simHitValidation_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 @@ -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, D019, 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() @@ -26,18 +26,27 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 - process = cms.Process('HGCalSimHitLocal',Phase2C20I13M9) + process = cms.Process('Client',Phase2C20I13M9) elif (options.geometry == "D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('HGCalSimHitLocal',PhaseC22I13M9) + process = cms.Process('Client',PhaseC22I13M9) elif (options.geometry == "D106"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('HGCalSimHitLocal',PhaseC22I13M9) + process = cms.Process('Client',PhaseC22I13M9) elif (options.geometry == "D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('HGCalSimHitLocal',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('HGCalSimHitLocal',Phase2C17I13M9)