Merge pull request #45811 from bsunanda/Phase2-hgx359V

Phase2-hgx359V Modify the testing code in HGCalCommonData & GeometryHGCal in view of changes made in the Configuration/Geometry area for Phase2 scenarios
cms-sw · Aug 31, 2024 · 72b6ce3 · 72b6ce3
2 parents b8d34ab + abc9d59
commit 72b6ce3
Show file tree

Hide file tree

Showing 24 changed files with 193 additions and 207 deletions.
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun dumpHGCalGeometryDD4hep_cfg.py geometry=D88
+#   cmsRun dumpHGCalGeometryDD4hep_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D98, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D98, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun dumpHGCalGeometryDDD_cfg.py geometry=D88
+#   cmsRun dumpHGCalGeometryDDD_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D98, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D98, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runHGCalDD4hep_cfg.py geometry=D88
+#   cmsRun runHGCalDD4hep_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D98, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D98, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runHGCalDDD_cfg.py geometry=D88
+#   cmsRun runHGCalDDD_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D98, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D98, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCGeometry_cfg.py geometry=D88
+#   cmsRun testHGCGeometry_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalPartialWaferTester_cfg.py geometry=D88
+#   cmsRun testHGCalPartialWaferTester_cfg.py geometry=D119
 #
-#   Options for geometry D88, D92, D93, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -32,7 +33,7 @@
 print("Geometry file: ", geomFile)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
-process.load(geomFile")
+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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalScintID_cfg.py geometry=D88
+#   cmsRun testHGCalScintID_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalValidHex_cfg.py geometry=D88
+#   cmsRun testHGCalValidHex_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalValidityCheck_cfg.py geometry=D88
+#   cmsRun testHGCalValidityCheck_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### 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
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalWafer_cfg.py geometry=D88
+#   cmsRun testHGCalWafer_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93, D99, D101
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D99, D101")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### get and parse the command line arguments
 options.parseArguments()

diff --git a/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py b/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py
@@ -1,26 +1,45 @@
+###############################################################################
+# Way to use this:
+#   cmsRun hgcGeomAnalyzer_cfg.py geom=v17
+#
+#   Options for geometry v16, v17, v18
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
 from FWCore.ParameterSet.VarParsing import VarParsing
 from Configuration.StandardSequences.Eras import eras
 from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 
 options = VarParsing()
-options.register ("geom", "",  VarParsing.multiplicity.singleton, VarParsing.varType.string)
-options.parseArguments()
+options.register ("geom",
+                  "v17",
+                  VarParsing.multiplicity.singleton, VarParsing.varType.string,
+                  "geom of operations: v16, v17, v18")
 
-fileName = "geom_output_"+options.geom
+options.parseArguments()
 
 process = cms.Process("demo",eras.Phase2C17I13M9)
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 if options.geom == 'v16':
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
+    geomFile = 'Configuration.Geometry.GeometryExtended2026D100Reco_cff'
 elif options.geom == 'v17':
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    geomFile = 'Configuration.Geometry.GeometryExtended2026D110Reco_cff'
+elif options.geom == 'v18':
+    geomFile = 'Configuration.Geometry.GeometryExtended2026D104Reco_cff'
 else:
-    raise Exception('UNKNOWN GEOMETRY!')
+    geomFile = 'UNKNOWN GEOMETRY!'
+    raise Exception(geomFile)
+
+fileName = "geom_output_"+options.geom
+
+print("Geometry file: ", geomFile)
+print("Output   file: ", fileName)
 
+process.load(geomFile)
+
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T25', '')
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 if hasattr(process,'MessageLogger'):

diff --git a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py
@@ -4,8 +4,8 @@
 
 process = cms.Process("CaloCellGeometryTest",Phase2C17I13M9)
 
-process.load("Configuration.Geometry.GeometryExtended2026D92_cff")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if hasattr(process,'MessageLogger'):

diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalCellDumpDDD_cfg.py geometry=D86
+#   cmsRun testHGCalCellDumpDDD_cfg.py geometry=D110
 #
-#   Options for geometry D86, D88, D92, D93
+#   Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105,
+#                        D106, D107, D108, D109, D110, D111, D112, D113, D114
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,36 +14,27 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D86",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D86, D88, D92, D93")
+                  "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114")
 
 ### get and parse the command line arguments
 options.parseArguments()
 
 print(options)
 
+
 ####################################################################
 # Use the options
 
-if (options.geometry == "D88"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('PROD',Phase2C17I13M9)
+
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
 
+process.load(geomFile)
 process.load("Geometry.HGCalGeometry.hgcalGeometryDump_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')