Merge pull request #45444 from bsunanda/Phase2-hgx359B

Phase2-hgx359B Update the cfg files in Validation/Geometry in view of recent updates of the scenarios
cms-sw · Jul 17, 2024 · 5e040b8 · 5e040b8
2 parents d79aab2 + 5a97b1f
commit 5e040b8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py b/Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runMaterialBudgetHFNose_cfg.py geometry=D94 type=DD4hep pos=Start
+#   cmsRun runMaterialBudgetHFNose_cfg.py geometry=D115 type=DD4hep pos=Start
 #
-#   Options for geometry D92, D94
+#   Options for geometry D100, D115
 #   Options for type DD4hep, DDD
 #   Options for pos Start, End
 #
@@ -15,10 +15,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D94",
+                 "D100",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D92, D94")
+                  "geometry of operations: D100, D115")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,
@@ -37,7 +37,7 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D94"):
+if (options.geometry == "D115"):
     nose = 1
 else:
     nose = 0

diff --git a/Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py
@@ -2,9 +2,8 @@
 # Way to use this:
 #   cmsRun runMaterialBudgetVolume2026DD4hep_cfg.py geometry=D92
 #
-#   Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D97, D98,
-#                        D99, D100, D101, D102, D103, D104, D105, D106, D107,
-#                        D108, D109, D110
+#   Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
+#                        D110, D111, D112, D113, D114, D115
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -15,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110")
+                  "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()
 
@@ -28,7 +27,7 @@
 # Use the options
 
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-if (options.geometry == "D94"):
+if (options.geometry == "D115"):
     from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
     process = cms.Process('MaterialBudgetVolume',Phase2C20I13M9,dd4hep)
 else:

diff --git a/Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py
@@ -2,9 +2,8 @@
 # Way to use this:
 #   cmsRun runMaterialBudgetVolume2026DDD_cfg.py geometry=D92
 #
-#   Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D97, D98,
-#                        D99, D100, D101, D102, D103, D104, D105, D106, D107,
-#                        D108, D109, D110
+#   Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
+#                        D110, D111, D112, D113, D114, D115
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -15,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110")
+                  "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 +26,7 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D94"):
+if (options.geometry == "D115"):
     from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
     process = cms.Process('MaterialBudgetVolume',Phase2C20I13M9)
 else:

diff --git a/Validation/Geometry/test/runMaterialBudgetVolumeXML_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolumeXML_cfg.py
@@ -3,6 +3,7 @@
 #   cmsRun runMaterialBudgetVolumeXML_cfg.py type=DDD
 #
 #   Options for type DDD, DD4hep
+#   Options for geometry 2021, 2023, 2024
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -12,6 +13,11 @@
 ####################################################################
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
+options.register('geometry',
+                 "2021",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "geometry of operations: 2021, 2023, 2024")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,
@@ -30,13 +36,13 @@
 if (options.type == "DDD"):
     from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
     process = cms.Process('PROD',Run3_DDD)
-    geomFile = "Configuration.Geometry.GeometryExtended2021Reco_cff"
-    fileName = "matbdgRun3dddXML.root"
+    geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff"
+    fileName = "matbdg" + options.geometry + "dddXML.root"
 else:
     from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
     process = cms.Process('PROD',Run3_dd4hep)
-    geomFile = "Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff"
-    fileName = "matbdgRun3ddhepXML.root"
+    geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + options.geometry + "Reco_cff"
+    fileName = "matbdg" + options.geometry + "ddhepXML.root"
 
 print("Geometry file Name: ", geomFile)
 print("Root file Name:     ", fileName)

diff --git a/Validation/Geometry/test/runP_HGCal_cfg.py b/Validation/Geometry/test/runP_HGCal_cfg.py
@@ -15,7 +15,7 @@
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 
-# The default geometry is Extended2026D92Reco. If a different geoemtry
+# The default geometry is Extended2026D110Reco. If a different geoemtry
 # is needed, the appropriate flag has to be passed at command line,
 # e.g.: cmsRun runP_HGCal_cfg.py geom="XYZ"
 
@@ -30,7 +30,7 @@
 
 options = VarParsing('analysis')
 options.register('geom',             #name
-                 'Extended2026D92',      #default value
+                 'Extended2026D110',      #default value
                  VarParsing.multiplicity.singleton,   # kind of options
                  VarParsing.varType.string,           # type of option
                  "Select the geometry to be studied"  # help message