Update several scripts in Geometry/HGCalCommonData/test/python to sup…

…port only v16 and V17 geometries of HGCal

Geometry/HGCalCommonData/test/python/dumpHGCalDD4hep_cfg.py

@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun dumpHGCalDD4hep_cfg.py geometry=D92
 #
-#   Options for geometry D77, D83, D88, D92, D93
+#   Options for geometry D88, D92, D93
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D77, D83, D88, D92, D93")
+                  "geometry of operations: D88, D92, D93")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -27,36 +27,18 @@
 # Use the options
 
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-if (options.geometry == "D83"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('DUMP',Phase2C11M9,dd4hep)
-    geomFile = 'Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml'
-    fileName = 'hgcalV15DD4hep.root'
-elif (options.geometry == "D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('DUMP',Phase2C11,dd4hep)
-    geomFile = 'Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D77.xml'
-    fileName = 'hgcalV14DD4hep.root'
-elif (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('DUMP',Phase2C11M9,dd4hep)
-    geomFile = 'Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml'
-    fileName = 'hgcalV17DD4hep.root'
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('DUMP',Phase2C11M9,Run3_dd4hep)
-    geomFile = 'Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml'
-    fileName = 'hgcalV17nDD4hep.root'
-else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('DUMP',Phase2C11M9,dd4hep)
-    geomFile = 'Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml'
-    fileName = 'hgcalV16DD4hep.root'
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+
+process = cms.Process('DUMP',Phase2C17I13M9,dd4hep)
+
+geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff"
+fileName = "hgcal" + options.geometry + "DD4hep.root"
 
 print("Geometry file Name: ", geomFile)
-print("Dump file Name: ", fileName)
+print("Dump file Name:     ", fileName)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
+process.load(geomFile)
 
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
@@ -67,14 +49,13 @@
 if hasattr(process,'MessageLogger'):
     process.MessageLogger.HGCalGeom=dict()
 
-process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath(geomFile),
-                                            appendToDataLabel = cms.string('DDHGCal')
-                                            )
 
-process.testDump = cms.EDAnalyzer("DDTestDumpFile",
-                                  outputFileName = cms.untracked.string(fileName),
-                                  DDDetector = cms.ESInputTag('','DDHGCal')
-                                  )
+process.add_(cms.ESProducer("TGeoMgrFromDdd",
+                            verbose = cms.untracked.bool(False),
+                            level = cms.untracked.int32(14)
+                            ))
+
+process.dump = cms.EDAnalyzer("DumpSimGeometry",
+                              outputFileName = cms.untracked.string(fileName))
 
-process.p = cms.Path(process.testDump)
+process.p = cms.Path(process.dump)

Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py

@@ -1,6 +1,38 @@
+###############################################################################
+# Way to use this:
+#   cmsRun dumpHGCalGeometryDD4hep_cfg.py geometry=D88
+#
+#   Options for geometry D88, D92, D93
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
+import os, sys, imp, re
+import FWCore.ParameterSet.VarParsing as VarParsing
 
-process = cms.Process("DDHGCalTBModuleXTest")
+####################################################################
+### SETUP OPTIONS
+options = VarParsing.VarParsing('standard')
+options.register('geometry',
+                 "D88",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "geometry of operations: D88, D92, D93")
+
+### 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('GeomDump',Phase2C17I13M9)
+
+geomFile = "Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026" + options.geometry + ".xml"
+fileName = "CMS2026" + options.geometry + "DD4hep.root"
+
+print("Geometry file: ", geomFile)
+print("Output file:   ", fileName)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.source = cms.Source("EmptySource")
@@ -13,12 +45,12 @@
     process.MessageLogger.HGCalGeom=dict()
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/testHGCalV14.xml'),
+                                            confGeomXMLFiles = cms.FileInPath(geomFile),
                                             appendToDataLabel = cms.string('DDHGCal')
                                             )
 
 process.testDump = cms.EDAnalyzer("DDTestDumpFile",
-                                  outputFileName = cms.untracked.string('HGCalDD4hep.root'),
+                                  outputFileName = cms.untracked.string(fileName),
                                   DDDetector = cms.ESInputTag('','DDHGCal')
                                   )
 

Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py

@@ -1,7 +1,40 @@
+###############################################################################
+# Way to use this:
+#   cmsRun dumpHGCalGeometryDDD_cfg.py geometry=D88
+#
+#   Options for geometry D88, D92, D93
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
+import os, sys, imp, re
+import FWCore.ParameterSet.VarParsing as VarParsing
 
-process = cms.Process("DUMP")
-process.load("Geometry.HGCalCommonData.testHGCalV14XML_cfi")
+####################################################################
+### SETUP OPTIONS
+options = VarParsing.VarParsing('standard')
+options.register('geometry',
+                 "D88",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "geometry of operations: D88, D92, D93")
+
+### 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('GeomDump',Phase2C17I13M9)
+
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+fileName = "CMS2026" + options.geometry + "DDD.root"
+
+print("Geometry file: ", geomFile)
+print("Output file:   ", fileName)
+
+process.load(geomFile)
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if 'MessageLogger' in process.__dict__:
@@ -11,17 +44,14 @@
 
 process.source = cms.Source("EmptySource")
 
-process.maxEvents = cms.untracked.PSet(
-    input = cms.untracked.int32(1)
-)
+process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) )
 
 process.add_(cms.ESProducer("TGeoMgrFromDdd",
-        verbose = cms.untracked.bool(False),
-        level   = cms.untracked.int32(14)
-))
-
+                            verbose = cms.untracked.bool(False),
+                            level = cms.untracked.int32(14)
+                            ))
 
 process.dump = cms.EDAnalyzer("DumpSimGeometry",
-                              outputFileName = cms.untracked.string('HGCalDDD.root'))
+                              outputFileName = cms.untracked.string(fileName))
 
 process.p = cms.Path(process.dump)