Merge pull request #30305 from bsunanda/Run4-hgx248

Run4-hgx248 Add ERA corresponding to V12 Geometry
cms-sw · Jun 26, 2020 · b33b70d · b33b70d
2 parents 9b69426 + 54a7c0e
commit b33b70d
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 5 deletions.
diff --git a/Configuration/Eras/python/Era_Phase2C11_cff.py b/Configuration/Eras/python/Era_Phase2C11_cff.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C9_cff import Phase2C9
+from Configuration.Eras.Modifier_phase2_hgcalV12_cff import phase2_hgcalV12
+
+Phase2C11 = cms.ModifierChain(Phase2C9, phase2_hgcalV12)
+
diff --git a/Configuration/Eras/python/Era_Phase2C11_dd4hep_cff.py b/Configuration/Eras/python/Era_Phase2C11_dd4hep_cff.py
@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
+from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
+
+Phase2C11_dd4hep = cms.ModifierChain(Phase2C11, dd4hep)
diff --git a/Configuration/Eras/python/Era_Phase2C12_cff.py b/Configuration/Eras/python/Era_Phase2C12_cff.py
@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
+from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
+
+Phase2C12 = cms.ModifierChain(Phase2C11, phase2_hfnose)
+
diff --git a/Configuration/Eras/python/Era_Phase2C12_dd4hep_cff.py b/Configuration/Eras/python/Era_Phase2C12_dd4hep_cff.py
@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C12_cff import Phase2C12
+from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
+
+Phase2C12_dd4hep = cms.ModifierChain(Phase2C12, dd4hep)
diff --git a/Configuration/Eras/python/Modifier_phase2_hgcalV12_cff.py b/Configuration/Eras/python/Modifier_phase2_hgcalV12_cff.py
@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is for HGCal V12 geometry-specific changes for sim, reco, etc.
+
+phase2_hgcalV12 =  cms.Modifier()
+
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -865,7 +865,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, phase2_hgcalV10, phase2_hgcalV11, hcalHardcodeConditions, hcalSkipPacker",
+        "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, hcalHardcodeConditions, hcalSkipPacker",
     },
     "C12" : {
         1 : [
@@ -950,7 +950,7 @@
             'from Geometry.EcalMapping.EcalMapping_cfi import *',
             'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
         ],
-        "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, phase2_hgcalV10, phase2_hgcalV11, phase2_hfnose, hcalHardcodeConditions, hcalSkipPacker",
+        "era" : "run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_hgcalV9, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose, hcalHardcodeConditions, hcalSkipPacker",
     },
 
 }

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -842,14 +842,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'Extended2026D57',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C9',
+        'Era' : 'Phase2C11',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
     '2026D58' : {
         'Geom' : 'Extended2026D58',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C10',
+        'Era' : 'Phase2C12',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
 }

diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -40,11 +40,15 @@ def __init__(self):
                  'Phase2C8',
                  'Phase2C9',
                  'Phase2C10',
+                 'Phase2C11',
+                 'Phase2C12',
                  'Phase2C4_dd4hep',
                  'Phase2C6_dd4hep',
                  'Phase2C8_dd4hep',
                  'Phase2C9_dd4hep',
                  'Phase2C10_dd4hep',
+                 'Phase2C11_dd4hep',
+                 'Phase2C12_dd4hep',
         ]
 
         internalUseMods = ['run2_common', 'run2_25ns_specific',
@@ -57,7 +61,7 @@ def __init__(self):
                            'phase1Pixel', 'run3_GEM', 'run2_GEM_2017',
                            'run2_CSC_2018',
                            'phase2_common', 'phase2_tracker',
-                           'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hgcalV9', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11',
+                           'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hgcalV9', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11', 'phase2_hgcalV12',
                            'phase2_timing_layer', 'phase2_hcal', 'phase2_ecal',
                            'phase2_trigger',
                            'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',