diff --git a/Validation/HGCalValidation/test/python/standalone_fromRECO.py b/Validation/HGCalValidation/test/python/standalone_fromRECO.py index 957e316403aaa..59babc3a46ea3 100644 --- a/Validation/HGCalValidation/test/python/standalone_fromRECO.py +++ b/Validation/HGCalValidation/test/python/standalone_fromRECO.py @@ -7,7 +7,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( @@ -44,7 +44,7 @@ # Additional output definition from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') process.load("Validation.HGCalValidation.hgcalHitValidation_cfi") process.load("Validation.HGCalValidation.hgcalHitCalibration_cfi") diff --git a/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py b/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py index 86bdcd97b1666..0de8b58f9f867 100644 --- a/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py +++ b/Validation/HGCalValidation/test/python/standalone_fromRECO_HARVESTING.py @@ -8,7 +8,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') -process.load('Configuration.Geometry.GeometryExtended2023D17Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') @@ -40,7 +40,7 @@ # Other statements from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') # Path and EndPath definitions process.dqmsave_step = cms.Path(process.DQMSaver) diff --git a/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py b/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py index 5faa8a8e4bcba..61e0ecc98153f 100644 --- a/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py +++ b/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py @@ -2,17 +2,17 @@ import FWCore.ParameterSet.Config as cms import FWCore.ParameterSet.VarParsing as VarParsing -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 options = VarParsing.VarParsing ('standard') options.register('inputFile', 'step3_inDQM.root', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Input file") -options.register ('globalTag', 'auto:phase2_realistic_T15', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") +options.register ('globalTag', 'auto:phase2_realistic_T33', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") options.parseArguments() print("Input file: ", options.inputFile) print("GlobalTag: ", options.globalTag) -process = cms.Process('HARVESTING',Phase2C9) +process = cms.Process('HARVESTING',Phase2C17I13M9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') @@ -20,7 +20,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.DQMSaverAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') diff --git a/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py b/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py index c60496c1b3530..c7143ea33605d 100644 --- a/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py +++ b/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py @@ -2,19 +2,19 @@ import FWCore.ParameterSet.Config as cms import FWCore.ParameterSet.VarParsing as VarParsing -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 options = VarParsing.VarParsing ('standard') options.register('inputFile', 'step3.root', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Input file") options.register('outputFile', 'step3_reReco_ticlOnly.root', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Output file") -options.register ('globalTag', 'auto:phase2_realistic_T15', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") +options.register ('globalTag', 'auto:phase2_realistic_T33', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") options.parseArguments() print("Input file: ", options.inputFile) print("Output file: ", options.outputFile) print("GlobalTag: ", options.globalTag) -process = cms.Process('TICL',Phase2C9) +process = cms.Process('TICL',Phase2C17I13M9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') @@ -22,7 +22,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') diff --git a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py index 963c40f435def..f97cf92fb4bdd 100644 --- a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py @@ -10,7 +10,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D94Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D115Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py b/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py index ccee0ae2f97dd..6a036c71d064b 100644 --- a/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun runHGCalBHValid_cfg.py geometry=D99 +# cmsRun runHGCalBHValid_cfg.py geometry=D110 # -# Options for geometry D98, D99, D108, D94, D103, D104, D106, D109 +# 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 +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, D109") + "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() @@ -25,21 +26,30 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 - process = cms.Process('Client',Phase2C20I13M9) + process = cms.Process('BHValid',Phase2C20I13M9) elif (options.geometry == "D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('BHValid',PhaseC22I13M9) elif (options.geometry == "D106"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('BHValid',PhaseC22I13M9) elif (options.geometry == "D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('BHValid',PhaseC22I13M9) +elif (options.geometry == "D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('BHValid',PhaseC22I13M9) +elif (options.geometry == "D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('BHValid',PhaseC22I13M9) +elif (options.geometry == "D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('BHValid',PhaseC22I13M9) else: from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 - process = cms.Process('Client',Phase2C17I13M9) + process = cms.Process('BHValid',Phase2C17I13M9) geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" fileName = "hgcBHValid" + options.geometry + ".root" diff --git a/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py index 23bb8fa287d7f..ac27945a0e2c5 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalSimHitSTudy_cfg.py geometry=D99 +# cmsRun testHGCalSimHitSTudy_cfg.py geometry=D110 # -# Options for geometry D98, D99, D108, D94, D103, D104, D106, D109 +# 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 +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, D109") + "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() @@ -25,21 +26,30 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 - process = cms.Process('Client',Phase2C20I13M9) + process = cms.Process('SimHitStudy',Phase2C20I13M9) elif (options.geometry == "D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('SimHitStudy',PhaseC22I13M9) elif (options.geometry == "D106"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('SimHitStudy',PhaseC22I13M9) elif (options.geometry == "D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('SimHitStudy',PhaseC22I13M9) +elif (options.geometry == "D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('SimHitStudy',PhaseC22I13M9) +elif (options.geometry == "D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('SimHitStudy',PhaseC22I13M9) +elif (options.geometry == "D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('SimHitStudy',PhaseC22I13M9) else: from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 - process = cms.Process('Client',Phase2C17I13M9) + process = cms.Process('SimHitStudy',Phase2C17I13M9) geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" fileName = "hgcalSimHit" + options.geometry + ".root" diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py index 8e74dabc3f89c..e5916a76ae99b 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV16_cfg.py @@ -9,8 +9,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtended2026D100Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D100_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py index ce9a6e76756bd..c9e1833053ed5 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py @@ -9,7 +9,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic50ns13TeVCollision_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalWaferValidation_cfg.py b/Validation/HGCalValidation/test/python/testHGCalWaferValidation_cfg.py index 364c7eb973fe9..d67cb210c951c 100644 --- a/Validation/HGCalValidation/test/python/testHGCalWaferValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalWaferValidation_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalWaferValidation_cfg.py geometry=D99 +# cmsRun testHGCalWaferValidation_cfg.py geometry=D110 # -# Options for geometry D98, D99, D108, D94, D103, D104, D106, D109 +# 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 +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, D109") + "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() @@ -24,21 +25,30 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 - process = cms.Process('Client',Phase2C20I13M9) + process = cms.Process('WaferValidation',Phase2C20I13M9) elif (options.geometry == "D104"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('WaferValidation',PhaseC22I13M9) elif (options.geometry == "D106"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('WaferValidation',PhaseC22I13M9) elif (options.geometry == "D109"): from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 - process = cms.Process('Client',PhaseC22I13M9) + process = cms.Process('WaferValidation',PhaseC22I13M9) +elif (options.geometry == "D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('WaferValidation',PhaseC22I13M9) +elif (options.geometry == "D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('WaferValidation',PhaseC22I13M9) +elif (options.geometry == "D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('WaferValidation',PhaseC22I13M9) else: from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 - process = cms.Process('Client',Phase2C17I13M9) + process = cms.Process('WaferValidation',Phase2C17I13M9) geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" if (options.geometry == "D98"):