Merge pull request #42252 from bsunanda/Phase2-hgx341H

Phase2-hgx341H Modify several test scripts in Geometry/HGCalCommonData to test geometry versions beyond the first V17
cms-sw · Jul 13, 2023 · 058ca1a · 058ca1a
2 parents 0c09bd5 + 0fd7e9f
commit 058ca1a
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 16 deletions.
diff --git a/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCGeometry_cfg.py geometry=D88
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D88, D92, D93, D99, D101
 #
 ###############################################################################
 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")
+                  "geometry of operations: D88, D92, D93, D99, D101")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalNumbering_cfg.py type=V17
 #
-#   Options for type V16, V17, V17n
+#   Options for type V16, V17, V17n, V18
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17n")
+                  "type of operations: V16, V17, V17n, V18")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py
@@ -1,8 +1,38 @@
+###############################################################################
+# Way to use this:
+#   cmsRun testHGCalPartialWaferTester_cfg.py geometry=D88
+#
+#   Options for geometry D88, D92, D93, D99, D101
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
+import os, sys, imp, re
+import FWCore.ParameterSet.VarParsing as VarParsing
+
+####################################################################
+### SETUP OPTIONS
+options = VarParsing.VarParsing('standard')
+options.register('geometry',
+                 "D88",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "geometry of operations: D88, D92, D93, D99, D101")
+
+### get and parse the command line arguments
+options.parseArguments()
+print(options)
+
+####################################################################
+# Use the options
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('PartailWaferTester',Phase2C17I13M9)
+
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+
+print("Geometry file: ", geomFile)
 
-process = cms.Process("PROD")
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
-process.load("Configuration.Geometry.GeometryExtended2026D92_cff")
+process.load(geomFile")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if hasattr(process,'MessageLogger'):

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalScintID_cfg.py geometry=D88
 #
-#   Options for geometry D88, D92
+#   Options for geometry D88, D92, D93, D99, D101
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92")
+                  "geometry of operations: D88, D92, D93, D99, D101")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalValidHex_cfg.py geometry=D88
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D88, D92, D93, D99, D101
 #
 ###############################################################################
 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")
+                  "geometry of operations: D88, D92, D93, D99, D101")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalValidityCheck_cfg.py geometry=D88
 #
-#   Options for geometry D88, D92
+#   Options for geometry D88, D92, D93, D99, D101
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92")
+                  "geometry of operations: D88, D92, D93, D99, D101")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalWaferID_cfg.py type=V17
 #
-#   Options for type V16, V17, V17Shift
+#   Options for type V16, V17, V17Shift, V18
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17Shift")
+                  "type of operations: V16, V17, V17Shift, V18")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalWafer_cfg.py geometry=D88
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D88, D92, D93, D99, D101
 #
 ###############################################################################
 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")
+                  "geometry of operations: D88, D92, D93, D99, D101")
 
 ### get and parse the command line arguments
 options.parseArguments()