Merge pull request #44037 from bsunanda/Run3-gex176A

Run3-gex176A update the cfg files in SimG4Core/PrintGeomInfo to access the new scenario
cms-sw · Feb 29, 2024 · 3c6062f · 3c6062f
2 parents 9664a3c + eb633b1
commit 3c6062f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4hep_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:  
 #   cmsRun g4OverlapCheckDD4hep_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2017, 2018, 2021, 2023
+#   Options for geometry 2017, 2018, 2021, 2023, 2024
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,7 +13,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2017, 2018, 2021, 2023")
+                  "geometry of operations: 2017, 2018, 2021, 2023, 2024")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDDD_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckDDD_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2018, 2021, 2023
+#   Options for geometry 2016, 2017, 2018, 2021, 2023, 2024
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2018, 2021, 2023")
+                  "geometry of operations: 2016, 2017, 2018, 2021, 2023, 2024")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,

diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4SolidsRun3_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4SolidsRun3_cfg.py
@@ -1,6 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runPrintG4SolidsRun3_cfg.py dd4hep=False
+#   cmsRun runPrintG4SolidsRun3_cfg.py dd4hep=False geometry=2021
+#
+#   Options for geometry 2021, 2023, 2024
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -15,6 +17,11 @@
                  VarParsing.VarParsing.multiplicity.singleton,
                  VarParsing.VarParsing.varType.bool,
                  "Geometry source DD4hep or DDD: False, True")
+options.register('geometry',
+                 "2021",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "geometry of operations: 2021, 2023, 2024")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,13 +33,16 @@
 if (options.dd4hep):
     from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
     process = cms.Process('PrintG4Solids',Run3_dd4hep)
-    process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff')
+    geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + options.geometry + "Reco_cff"
+    process.load(geomFile)
 else:
     from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
     process = cms.Process('PrintG4Solids',Run3_DDD)
-    process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
+    geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff"
+    process.load(geomFile)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
+print("Geometry file Name: ", geomFile)
 
 if hasattr(process,'MessageLogger'):
     process.MessageLogger.G4cerr=dict()

diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun grunPrintG4Touch_cfg.py geometry=2021
 #
-#   Options for geometry 2016, 2017, 2018, 2021, 2023
+#   Options for geometry 2016, 2017, 2018, 2021, 2023, 2024
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2018, 2021, 2023")
+                  "geometry of operations: 2016, 2017, 2018, 2021, 2023, 2024")
 
 ### get and parse the command line arguments
 options.parseArguments()