Merge pull request #33139 from fabiocos/fc-etlera

Update new Phase2C11xx eras by adding the etlV4 modifier

Configuration/Eras/python/Era_Phase2C11I13M9_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C11I13_cff import Phase2C11I13
+from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0
+
+Phase2C11I13M9 = cms.ModifierChain(Phase2C11I13, phase2_GE0)

Configuration/Eras/python/Era_Phase2C11T22M9_cff.py → Configuration/Eras/python/Era_Phase2C11I13T22M9_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
+from Configuration.Eras.Era_Phase2C11I13_cff import Phase2C11I13
 from Configuration.Eras.Modifier_phase2_squarePixels_cff import phase2_squarePixels
 from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0
 
-Phase2C11T22M9 = cms.ModifierChain(Phase2C11, phase2_squarePixels, phase2_GE0)
+Phase2C11I13T22M9 = cms.ModifierChain(Phase2C11I13, phase2_squarePixels, phase2_GE0)

Configuration/Eras/python/Era_Phase2C11T23M9_cff.py → Configuration/Eras/python/Era_Phase2C11I13T23M9_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
+from Configuration.Eras.Era_Phase2C11I13_cff import Phase2C11I13
 from Configuration.Eras.Modifier_phase2_3DPixels_cff import phase2_3DPixels
 from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0
 
-Phase2C11T23M9 = cms.ModifierChain(Phase2C11, phase2_3DPixels, phase2_GE0)
+Phase2C11I13T23M9 = cms.ModifierChain(Phase2C11I13, phase2_3DPixels, phase2_GE0)

Configuration/Eras/python/Era_Phase2C11_etlV4_cff.py → Configuration/Eras/python/Era_Phase2C11I13_cff.py

@@ -3,4 +3,4 @@
 from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
 from Configuration.Eras.Modifier_phase2_etlV4_cff import phase2_etlV4
 
-Phase2C11_etlV4 = cms.ModifierChain(Phase2C11, phase2_etlV4)
+Phase2C11I13 = cms.ModifierChain(Phase2C11, phase2_etlV4)

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1236,7 +1236,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'Extended2026D72',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11_etlV4',
+        'Era' : 'Phase2C11I13',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D74' : {
@@ -1250,37 +1250,37 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'Extended2026D75',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11',
+        'Era' : 'Phase2C11I13',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D76' : {
         'Geom' : 'Extended2026D76',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11M9',
+        'Era' : 'Phase2C11I13M9',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D77' : {
         'Geom' : 'Extended2026D77',
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11M9',
+        'Era' : 'Phase2C11I13M9',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D78' : {
         'Geom' : 'Extended2026D78', # N.B.: Geometry with square 50x50 um2 pixels in the Inner Tracker.
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T22',
         'ProcessModifier': 'PixelCPEGeneric',   # This swaps template reco CPE for generic reco CPE
-        'Era' : 'Phase2C11T22M9', # customized for square pixels and Muon M9
+        'Era' : 'Phase2C11I13T22M9', # customized for square pixels and Muon M9
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
     '2026D79' : {
         'Geom' : 'Extended2026D79', # N.B.: Geometry with 3D pixels in the Inner Tracker.
         'HLTmenu': '@fake2',
         'GT' : 'auto:phase2_realistic_T23',
         'ProcessModifier': 'PixelCPEGeneric',   # This swaps template reco CPE for generic reco CPE
-        'Era' : 'Phase2C11T23M9', # customizes for 3D Pixels and Muon M9
+        'Era' : 'Phase2C11I13T23M9', # customizes for 3D Pixels and Muon M9
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
 }

Configuration/StandardSequences/python/Eras.py

@@ -42,13 +42,14 @@ def __init__(self):
                  'Phase2C9_dd4hep',
                  'Phase2C10_dd4hep',
                  'Phase2C11_dd4hep',
-                 'Phase2C11_etlV4',
+                 'Phase2C11I13',
                  'Phase2C11T22',
                  'Phase2C11T23',
                  'Phase2C12_dd4hep',
                  'Phase2C11M9',
-                 'Phase2C11T22M9',
-                 'Phase2C11T23M9'
+                 'Phase2C11I13M9',
+                 'Phase2C11I13T22M9',
+                 'Phase2C11I13T23M9'
         ]
 
         internalUseMods = ['run2_common', 'run2_25ns_specific',
@@ -63,7 +64,7 @@ def __init__(self):
                            'phase2_common', 'phase2_tracker',
                            'phase2_muon', 'phase2_GEM', 'phase2_GE0',
                            'phase2_hgcal', 'phase2_timing', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11', 'phase2_hgcalV12',
-                           'phase2_timing_layer', 'phase2_hcal', 'phase2_ecal','phase2_ecal_devel',
+                           'phase2_timing_layer', 'phase2_etlV4', 'phase2_hcal', 'phase2_ecal','phase2_ecal_devel',
                            'phase2_trigger',
                            'phase2_squarePixels', 'phase2_3DPixels',
                            'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',