Merge pull request #48144 from bsunanda/Phase2-hgx363AM

cmsbuild · web-flow · commit 5e34731acc1e · 2025-05-22T09:11:26.000+02:00
Phase2-hgx363AM Update several test scripts in Geometry/HGCalCommonData/test/python
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDDD_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4hep_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDDD_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py
@@ -2,13 +2,13 @@
 # Way to use this:
 #   cmsRun dumpHGCalGeometryDD4hep_cfg.py geometry=D110
 #
-#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
-#                        D106, D107, D108, D109, D110, D111, D112, D113, D114,
-#                        D115, D116
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
+#                        D105, D106, D107, D108, D109, D110, D111, D112, D113,
+#                        D114, D115, D116, D117, D118, D119, D120
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -18,7 +18,7 @@
                  "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119, D120")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py
@@ -2,13 +2,13 @@
 # Way to use this:
 #   cmsRun dumpHGCalGeometryDDD_cfg.py geometry=D110
 #
-#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
-#                        D106, D107, D108, D109, D110, D111, D112, D113, D114,
-#                        D115, D116
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
+#                        D105, D106, D107, D108, D109, D110, D111, D112, D113,
+#                        D114, D115, D116, D117, D118, D119, D120
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -18,7 +18,7 @@
                  "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119, D120")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4hep_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDDD_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4hep_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDDD_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4hep_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDDD_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/dumpTBModuleDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpTBModuleDDD_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/g4OverlapCheckLayer_cfg.py b/Geometry/HGCalCommonData/test/python/g4OverlapCheckLayer_cfg.py
@@ -8,7 +8,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py
@@ -2,9 +2,9 @@
 # Way to use this:
 #   cmsRun runHGCalDD4hep_cfg.py geometry=D110
 #
-#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
-#                        D106, D107, D108, D109, D110, D111, D112, D113, D114,
-#                        D115, D116
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
+#                        D105, D106, D107, D108, D109, D110, D111, D112, D113,
+#                        D114, D115, D116, D117, D118, D119, D120
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -18,7 +18,7 @@
                  "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119, D120")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/runHGCalDDD_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalDDD_cfg.py
@@ -2,13 +2,13 @@
 # Way to use this:
 #   cmsRun runHGCalDDD_cfg.py geometry=D110
 #
-#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
-#                        D106, D107, D108, D109, D110, D111, D112, D113, D114,
-#                        D115, D116
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
+#                        D105, D106, D107, D108, D109, D110, D111, D112, D113,
+#                        D114, D115, D116, D117, D118, D119, D120
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -18,7 +18,7 @@
                  "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119, D120")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_cfg.py
@@ -2,11 +2,11 @@
 # Way to use this:
 #   cmsRun runHGCalTestDD4hep_cfg.py type=V17
 #
-#   Options for type V16, V17, V17n, V18
+#   Options for type V16, V17, V17n, V18, V19
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -16,7 +16,7 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17n, V18")
+                  "type of operations: V16, V17, V17n, V18, V19")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/runHGCalTestDDD_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalTestDDD_cfg.py
@@ -2,11 +2,11 @@
 # Way to use this:
 #   cmsRun runHGCalTestDDD_cfg.py type=V17
 #
-#   Options for type V16, V17, V17n, V17ng, V18, V18n, V18ng
+#   Options for type V16, V17, V17n, V17ng, V18, V18n, V18ng, V19
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -16,7 +16,7 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17n, V17ng, V18, V18n, V18ng")
+                  "type of operations: V16, V17, V17n, V17ng, V18, V18n, V18ng, V19")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py
@@ -8,7 +8,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py
@@ -8,7 +8,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py
@@ -6,14 +6,14 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D110",
+                 "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
                   "geometry of operations: D88")
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalV17Shift_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalV17Shift_cfg.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re, random
+import os, sys, importlib, re, random
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py
@@ -8,7 +8,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py
@@ -6,7 +6,7 @@
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -40,6 +40,8 @@
     geomFile = "Geometry.HGCalCommonData.testHGCalV17ShiftReco_cff"
 elif (options.type == "V16"):
     geomFile = "Configuration.Geometry.GeometryExtendedRun4D98_cff"
+elif (options.type == "V19"):
+    geomFile = "Configuration.Geometry.GeometryExtendedRun4D120_cff"
 else:
     geomFile = "Configuration.Geometry.GeometryExtendedRun4D110_cff"
 
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py
@@ -3,12 +3,12 @@
 #   cmsRun testHGCalWafer_cfg.py geometry=D110
 #
 #   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
-#                        D105,  D106, D107, D108, D109, D110, D111, D112, D113,
-#                        D114, D115, D116, D120
+#                        D105, D106, D107, D108, D109, D110, D111, D112,
+#                        D113, D114, D115, D116, D117, D118, D119, D120
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, importlib, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -18,7 +18,7 @@
                  "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D120")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119, D120")
 
 ### get and parse the command line arguments
 options.parseArguments()

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`###############################################################################`
`8`	`8`	`import FWCore.ParameterSet.Config as cms`
`9`		`-import os, sys, imp, re`
	`9`	`+import os, sys, importlib, re`
`10`	`10`	`import FWCore.ParameterSet.VarParsing as VarParsing`
`11`	`11`
`12`	`12`	`####################################################################`