Modify some of the test scripts in Validation/HGCalValidation for eac…

…h of calorimeter scenarios
cms-sw · Feb 10, 2024 · c8fc98a · c8fc98a
1 parent 93f14ae
commit c8fc98a
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 69 deletions.
diff --git a/Validation/HGCalValidation/test/python/digiClient_cfg.py b/Validation/HGCalValidation/test/python/digiClient_cfg.py
@@ -1,22 +1,21 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun digiClient_cfg.py geometry=D92
+#   cmsRun digiClient_cfg.py geometry=D99
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D98, D99, D108, D94, D103, D104, D106, D109
 #
 ###############################################################################
 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',
-                 "D88",
+                 "D99",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93")
+                  "geometry of operations: D98, D99, D108, D94, D103, D104, D106, D109")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,8 +25,21 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('Client',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('Client',Phase2C20I13M9)
+elif (options.geometry == "D104"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('Client',PhaseC22I13M9)
+elif (options.geometry == "D106"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('Client',PhaseC22I13M9)
+elif (options.geometry == "D109"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('Client',PhaseC22I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('Client',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 fileInput = "file:DigiVal" + options.geometry + ".root"

diff --git a/Validation/HGCalValidation/test/python/digiValidation_cfg.py b/Validation/HGCalValidation/test/python/digiValidation_cfg.py
@@ -1,22 +1,22 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun digiValidation_cfg.py geometry=D92
+#   cmsRun digiValidation_cfg.py geometry=D99
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D98, D99, D108, D94, D103, D104, D106, D109
 #
 ###############################################################################
 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',
-                 "D88",
+                 "D99",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93")
+                  "geometry of operations: D98, D99, D108, D94, D103, D104, D106, D109")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,8 +26,21 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('DigiValidation',Phase2C17I13M9)
+if (options.geometry == "D94"):
+        from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+        process = cms.Process('DigiValidation',Phase2C20I13M9)
+elif (options.geometry == "D104"):
+        from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+        process = cms.Process('DigiValidation',PhaseC22I13M9)
+elif (options.geometry == "D106"):
+        from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+        process = cms.Process('DigiValidation',PhaseC22I13M9)
+elif (options.geometry == "D109"):
+        from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+        process = cms.Process('DigiValidation',PhaseC22I13M9)
+else:
+        from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+        process = cms.Process('DigiValidation',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 fileName = "file:DigiVal" + options.geometry + ".root"

diff --git a/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py b/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py
@@ -1,22 +1,22 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun protoHGCalSimWatcher_cfg.py geometry=D88
+#   cmsRun protoHGCalSimWatcher_cfg.py geometry=D99
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D98, D99, D108, D94, D103, D104, D106, D109
 #
 ###############################################################################
 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',
-                 "D88",
+                 "D99",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93")
+                  "geometry of operations: D98, D99, D108, D94, D103, D104, D106, D109")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,8 +26,21 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PROD',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('PROD',Phase2C20I13M9)
+elif (options.geometry == "D104"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+elif (options.geometry == "D106"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+elif (options.geometry == "D109"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('PROD',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 fileCheck = "testHGCalSimWatcher2026" + options.geometry + ".root"
@@ -149,7 +162,7 @@
 # Other statements
 process.genstepfilter.triggerConditions=cms.vstring("generation_step")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
 
 process.generator = cms.EDProducer("FlatRandomPtGunProducer",
     PGunParameters = cms.PSet(

diff --git a/Validation/HGCalValidation/test/python/protoSimValid_cfg.py b/Validation/HGCalValidation/test/python/protoSimValid_cfg.py
@@ -1,23 +1,23 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun protoSimValid_cfg.py geometry=D88 type=hgcalBHValidation
+#   cmsRun protoSimValid_cfg.py geometry=D99 type=hgcalBHValidation
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D98, D99, D108, D94, D103, D104, D106, D109
 #               type hgcalBHValidation, hgcalSiliconValidation
 #
 ###############################################################################
 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',
-                 "D88",
+                 "D99",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93")
+                  "geometry of operations: D98, D99, D108, D94, D103, D104, D106, D109")
 options.register ('type',
                   "hgcalBHValidation",
                   VarParsing.VarParsing.multiplicity.singleton,
@@ -32,8 +32,21 @@
 ############################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PROD',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('PROD',Phase2C20I13M9)
+elif (options.geometry == "D104"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+elif (options.geometry == "D106"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+elif (options.geometry == "D109"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('PROD',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 if (options.type == "hgcalSiliconValidation"):
@@ -57,7 +70,6 @@
 process.load('GeneratorInterface.Core.genFilterSummary_cff')
 process.load('Configuration.StandardSequences.SimIdeal_cff')
 process.load('Configuration.StandardSequences.EndOfProcess_cff')
-process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 process.load('Configuration.StandardSequences.Digi_cff')
 process.load('Configuration.StandardSequences.SimL1Emulator_cff')
 process.load('Configuration.StandardSequences.L1TrackTrigger_cff')
@@ -109,8 +121,9 @@
 
 # Other statements
 process.genstepfilter.triggerConditions=cms.vstring("generation_step")
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
 
 # Additional output definition
 process.TFileService = cms.Service("TFileService",

diff --git a/Validation/HGCalValidation/test/python/protoValid_cfg.py b/Validation/HGCalValidation/test/python/protoValid_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun protoValid_cfg.py geometry=D88 type=hgcalSimHitStudy defaultInput=1
+#   cmsRun protoValid_cfg.py geometry=D99 type=hgcalSimHitStudy defaultInput=1
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D98, D99, D108, D94, D103, D104, D106, D109
 #               type hgcalGeomCheck, hgcalSimHitStudy, hgcalDigiStudy,
 #                    hgcalRecHitStudy, hgcalSiliconValidation
 #               defaultInput 1, 0
@@ -16,10 +16,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D88",
+                 "D99",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93")
+                  "geometry of operations: D98, D99, D108, D94, D103, D104, D106, D109")
 options.register('type',
                  "hgcalGeomCheck",
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -39,8 +39,21 @@
 ############################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PROD',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('PROD',Phase2C20I13M9)
+elif (options.geometry == "D104"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+elif (options.geometry == "D106"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+elif (options.geometry == "D109"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('PROD',PhaseC22I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('PROD',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 fileCheck = "testHGCalSimWatcher" + options.geometry + ".root"
@@ -68,8 +81,8 @@
 process.load("Configuration.EventContent.EventContent_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
-from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag = autoCond['phase2_realistic']
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
 
 process.MessageLogger.cerr.FwkReport.reportEvery = 5
 if hasattr(process,'MessageLogger'):

diff --git a/Validation/HGCalValidation/test/python/recHitClient_cfg.py b/Validation/HGCalValidation/test/python/recHitClient_cfg.py
@@ -1,22 +1,22 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun recHitClient_cfg.py geometry=D92
+#   cmsRun recHitClient_cfg.py geometry=D99
 #
-#   Options for geometry D88, D92, D93
+#   Options for geometry D98, D99, D108, D94, D103, D104, D106, D109
 #
 ###############################################################################
 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',
-                 "D88",
+                 "D99",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93")
+                  "geometry of operations: D98, D99, D108, D94, D103, D104, D106, D109")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,8 +26,21 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('Client',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('Client',Phase2C20I13M9)
+elif (options.geometry == "D104"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('Client',PhaseC22I13M9)
+elif (options.geometry == "D106"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('Client',PhaseC22I13M9)
+elif (options.geometry == "D109"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('Client',PhaseC22I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('Client',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 fileInput = "file:RecHitVal" + options.geometry + ".root"
@@ -45,7 +58,6 @@
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
 
-
 process.load("Validation.HGCalValidation.HGCalRecHitsClient_cff")
 process.hgcalRecHitClientEE.Verbosity     = 2
 process.hgcalRecHitClientHEF.Verbosity    = 2