Merge pull request #40726 from bsunanda/Run3-sim141

Run3-sim141 Update the scripts in SimG4Core/PrintGeomInfo/test/python
cms-sw · Feb 9, 2023 · 88952b7 · 88952b7
2 parents 96bea4a + e44f748
commit 88952b7
Show file tree

Hide file tree

Showing 14 changed files with 223 additions and 238 deletions.
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheck2026DD4hep_cfg.py geometry=D92 tol=0.1
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,9 +32,13 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-process = cms.Process('PROD',Phase2C17I13M9,dd4hep)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('OverlapCheck',Phase2C20I13M9,dd4hep)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('OverlapCheck',Phase2C17I13M9,dd4hep)
 
 geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff"
 baseName = "cms2026" + options.geometry + "DD4hep"

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheck2026DDD_cfg.py geometry=D88 tol=0.1
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,8 +32,12 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PROD',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('OverlapCheck',Phase2C20I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('OverlapCheck',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 baseName = "cms2026" + options.geometry + "DDD"

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckCalo_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Hcal2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Hcal2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Hcal2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Hcal2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Hcal2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Hcal2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckEcal_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Ecal2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Ecal2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Ecal2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Ecal2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Ecal2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Ecal2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun g4OverlapCheckHGCal_cfg.py geometry=D86 tol=0.1
+#   cmsRun g4OverlapCheckHGCal_cfg.py geometry=D88 tol=0.1
 #
-#   Options for geometry D77, D83, D86, D88
+#   Options for geometry D88, D92, D93, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +13,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D86",
+                 "D92",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D77, D83, D86, D88")
+                  "geometry of operations: D88, D92, D93, D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,29 +32,15 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D83"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import PHase2c11m9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff')
-    baseName = 'HGCal2026D83'
-elif (options.geometry == "D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'HGCal2026D86'
-elif (options.geometry == "D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'HGCal2026D77'
-else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-    baseName = 'HGCal2026D86'
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+baseName = "HGCal2026" + options.geometry
 
-print("Base file Name: ", baseName)
+print("Geometry file Name: ", geomFile)
+print("Base file Name:     ", baseName)
 
+process.load(geomFile)
 from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *
 process = checkOverlap(process)
 

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckMuon_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Muon2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Muon2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Muon2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Muon2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Muon2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Muon2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)

diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D82 tol=0.1
+#   cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D94 tol=0.1
 #
-#   Options for geometry D60, D82, D94
+#   Options for geometry D94
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D94",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D60, D82, D94")
+                  "geometry of operations: D94")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,23 +32,16 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D60"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff')
-    baseName = 'cms2026D60DDD'
-elif (options.geometry == "D82"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('PROD',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D82Reco_cff')
-    baseName = 'cms2026D82DDD'
-else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('PROD',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D94Reco_cff')
-    baseName = 'cms2026D94DDD'
+from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+process = cms.Process('OverlapCheck',Phase2C20I13M9)
 
-print("Base file Name: ", baseName)
+
+baseName = "cms2026" + options.geometry + "DDD"
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+
+
+print("Geometry file Name: ", geomFile)
+print("Base file Name:     ", baseName)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')