Modify the testing code in Validation/Geometry and SimG4CMS/Calo in v…

…iew of changes made in the Configuration/Geometry area for Phase2 scenarios
cms-sw · Aug 25, 2024 · c77daef · c77daef
1 parent 18e28ff
commit c77daef
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
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