Merge pull request #45812 from bsunanda/Phase2-hgx359W

Phase2-hgx359W Modify the testing code in some packages in RecLocalCalo, SimG4CMS and Validation because of changes made in the Configuration/Geometry area for Phase2 scenarios
cms-sw · Aug 31, 2024 · 7070984 · 7070984
2 parents 72b6ce3 + 7be61b9
commit 7070984
Show file tree

Hide file tree

Showing 20 changed files with 35 additions and 30 deletions.
diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py
@@ -3,7 +3,7 @@
 
 process = cms.Process("TestPartial",Phase2C11)
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('RecoLocalCalo.HGCalRecAlgos.hgcalRecHitToolsPartialWafer_cff')

diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py
@@ -3,7 +3,7 @@
 
 process = cms.Process("TestPartial",Phase2C11)
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('RecoLocalCalo.HGCalRecAlgos.hgcalRecHitToolsPartialWafer_cff')

diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py
@@ -4,7 +4,7 @@
 process = cms.Process("PROD",Phase2C11)
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("Configuration.EventContent.EventContent_cff")
 process.load('Configuration.StandardSequences.Generator_cff')

diff --git a/SimG4CMS/Calo/test/python/minbias.py b/SimG4CMS/Calo/test/python/minbias.py
@@ -51,7 +51,7 @@
 elif (options.geometry == "2026"):
     from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
     process = cms.Process('Sim',Phase2C11M9)
-    geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D88Reco_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D110Reco_cff"
     globalTag = "auto:phase2_realistic"
 else:
     process = cms.Process('Sim')

diff --git a/SimG4CMS/Calo/test/python/minbias2026_cfg.py b/SimG4CMS/Calo/test/python/minbias2026_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalParametersDDD_cfg.py type=V18
 #
-#   Options for type D88, D92, V17Shift, V18
+#   Options for type V16, V17, V17Shift, V18
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "V18",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, V17Shift, V18")
+                  "type of operations: V16, V17, V17Shift, V18")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -30,8 +30,11 @@
     geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "Reco_cff"
 elif (options.type == "V17Shift"):
     geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "Reco_cff"
+elif (options.type == "V17"):
+    geomFile = "Configuration.Geometry.GeometryExtended2026D110Reco_cffelse:
 else:
-    geomFile = "Configuration.Geometry.GeometryExtended2026" + options.type + "Reco_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended2026D100Reco_cff"
+
 outFile = "minbias" + options.type + ".root"
 
 print("Geometry file: ", geomFile)

diff --git a/SimG4CMS/Calo/test/python/runHGC7_cfg.py b/SimG4CMS/Calo/test/python/runHGC7_cfg.py
@@ -4,7 +4,7 @@
 process = cms.Process("PROD",Phase2C11)
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("Configuration.EventContent.EventContent_cff")
 process.load('Configuration.StandardSequences.Generator_cff')

diff --git a/SimG4CMS/Calo/test/python/runHGC8_cfg.py b/SimG4CMS/Calo/test/python/runHGC8_cfg.py
@@ -4,7 +4,7 @@
 process = cms.Process("PROD",Phase2C11)
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D88Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("Configuration.EventContent.EventContent_cff")
 process.load('Configuration.StandardSequences.Generator_cff')

diff --git a/SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py b/SimG4CMS/Calo/test/python/testHGCalGuardRing_cfg.py
@@ -4,7 +4,7 @@
 process = cms.Process("HGCalGuardRingTest",Phase2C17I13M9)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if hasattr(process,'MessageLogger'):

diff --git a/SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py b/SimG4CMS/Calo/test/python/testHGCalMouseBite_cfg.py
@@ -9,7 +9,7 @@
                  "V18",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17Shift")
+                  "type of operations: V16, V17, V17Shift, V18")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -22,11 +22,13 @@
 ####################################################################
 # Use the options
 if (options.type == "V18"):
-    geomFile = "Geometry.HGCalCommonData.testHGCalV18Reco_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended2026D104_cff"
+elif (options.type == "V17Shift"):
+    geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "Reco_cff"
 elif (options.type == "V16"):
-    geomFile = "Configuration.Geometry.GeometryExtended2026D88_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended2026D100_cff"
 else:
-    geomFile = "Configuration.Geometry.GeometryExtended2026D92_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended2026D110_cff"
 
 print("Geometry file: ", geomFile)
 

diff --git a/SimG4CMS/Calo/test/python/ttbar.py b/SimG4CMS/Calo/test/python/ttbar.py
@@ -51,7 +51,7 @@
 elif (options.geometry == "2026"):
     from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
     process = cms.Process('Sim',Phase2C11M9)
-    geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D88Reco_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D110Reco_cff"
     globalTag = "auto:phase2_realistic"
 else:
     process = cms.Process('Sim')

diff --git a/Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py
@@ -1,6 +1,6 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runMaterialBudgetVolume2026DD4hep_cfg.py geometry=D92
+#   cmsRun runMaterialBudgetVolume2026DD4hep_cfg.py geometry=D110
 #
 #   Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
 #                        D110, D111, D112, D113, D114, D115

diff --git a/Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py
@@ -1,6 +1,6 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runMaterialBudgetVolume2026DDD_cfg.py geometry=D92
+#   cmsRun runMaterialBudgetVolume2026DDD_cfg.py geometry=D110
 #
 #   Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
 #                        D110, D111, D112, D113, D114, D115

diff --git a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py
@@ -4,14 +4,14 @@
 process = cms.Process('PROD',Phase2C20I13M9)
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
-process.load('Configuration.Geometry.GeometryExtended2026D94Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D115Reco_cff')
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.StandardSequences.RawToDigi_cff')
 process.load('Validation.HGCalValidation.hfnoseDigiStudy_cfi')
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
 
 if hasattr(process,'MessageLogger'):
     process.MessageLogger.HGCalValidation=dict()

diff --git a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py
@@ -4,15 +4,15 @@
 from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
 process = cms.Process('PROD',Phase2C20I13M9)
 
-process.load('Configuration.Geometry.GeometryExtended2026D94Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D115Reco_cff')
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.EventContent.EventContent_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 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.MessageLogger.cerr.FwkReport.reportEvery = 2
 if 'MessageLogger' in process.__dict__:

diff --git a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py
@@ -5,14 +5,14 @@
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
-process.load('Configuration.Geometry.GeometryExtended2026D94_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D115_cff')
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("Configuration.EventContent.EventContent_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Validation.HGCalValidation.hfnoseSimHitStudy_cfi')
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
 
 if hasattr(process,'MessageLogger'):
     process.MessageLogger.HGCalValidation=dict()

diff --git a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py
@@ -91,7 +91,7 @@
 # Other statements
 process.genstepfilter.triggerConditions=cms.vstring("generation_step")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
 
 process.generator = cms.EDProducer("FlatRandomEGunProducer",
     PGunParameters = cms.PSet(

diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py
@@ -96,7 +96,7 @@
 # Other statements
 process.genstepfilter.triggerConditions=cms.vstring("generation_step")
 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.generator = cms.EDProducer("FlatRandomPtGunProducer",
     PGunParameters = cms.PSet(

diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py
@@ -96,7 +96,7 @@
 # Other statements
 process.genstepfilter.triggerConditions=cms.vstring("generation_step")
 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.generator = cms.EDProducer("FlatRandomPtGunProducer",
     PGunParameters = cms.PSet(

diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py
@@ -96,7 +96,7 @@
 # Other statements
 process.genstepfilter.triggerConditions=cms.vstring("generation_step")
 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.generator = cms.EDProducer("FlatRandomPtGunProducer",
     PGunParameters = cms.PSet(

diff --git a/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py b/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py
@@ -16,8 +16,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.GeometryExtended2026D110Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D110_cff')
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi')
@@ -87,7 +87,7 @@
 
 # Other statements
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '')
 
 # load HGCAL TPG simulation
 process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff')