Merge pull request #47453 from bsunanda/Run3-gex187H

Run3-gex187H Modify some of the overlap scripts to test overlaps in the new muon scenarios

Author: cmsbuild

Geometry/MuonCommonData/test/python/g4OverlapCheck2021_cfg.py

@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheck2021_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2021, 2023, 2024, 2025
+#   Options for geometry 2018, 2021, 2023, 2024, 2025
 #           for tol      0.01, 0.1, 1.0
 #
 ###############################################################################
@@ -17,7 +17,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2021, 2023, 2024, 2025")
+                  "geometry of operations: 2018, 2021, 2023, 2024, 2025")
 options.register('tol',
                  0.01,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -38,8 +38,12 @@
 print("Geometry file: ", geomName)
 print("Base name:     ", baseName)
 
-from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
-process = cms.Process('OverlapCheck',Run3_DDD)
+if (options.geometry == "2018"):
+    from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+    process = cms.Process('OverlapCheck',Run2_2018)
+else:
+    from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
+    process = cms.Process('OverlapCheck',Run3_DDD)
 
 process.load(geomName)
 process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff")

Geometry/MuonCommonData/test/python/g4OverlapCheckMuon_cfg.py

@@ -14,7 +14,7 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "2021",
+                 "2022",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
                   "geometry of operations: 2022, 2023, 2024, 2025")