Merge pull request #1 from kpedro88/EcalPhase2NewDigitization_11_2_X_…

…rebase Use special workflow instead of Era
forthommel · Oct 23, 2020 · 2b887b5 · 2b887b5
2 parents da7bc0e + 7d7fa8d
commit 2b887b5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py b/Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -584,6 +584,30 @@ def condition(self, fragment, stepList, key, hasHarvest):
     offset = 0.6,
 )
 
+class UpgradeWorkflow_ecalDevel(UpgradeWorkflow):
+    def setup_(self, step, stepName, stepDict, k, properties):
+        # temporarily remove trigger & downstream steps
+        mods = {'--era': stepDict[step][k]['--era']+',phase2_ecal_devel'}
+        if 'Digi' in step:
+            mods['-s'] = 'DIGI:pdigi_valid'
+        stepDict[stepName][k] = merge([mods, stepDict[step][k]])
+    def condition(self, fragment, stepList, key, hasHarvest):
+        return fragment=="TTbar_14TeV" and '2026' in key
+upgradeWFs['ecalDevel'] = UpgradeWorkflow_ecalDevel(
+    steps = [
+        'DigiTrigger',
+        'RecoGlobal',
+        'HARVESTGlobal',
+    ],
+    PU = [
+        'DigiTrigger',
+        'RecoGlobal',
+        'HARVESTGlobal',
+    ],
+    suffix = '_ecalDevel',
+    offset = 0.61,
+)
+
 class UpgradeWorkflow_0T(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         myGT=stepDict[step][k]['--conditions']

diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -44,7 +44,6 @@ def __init__(self):
                  'Phase2C11_dd4hep',
                  'Phase2C12_dd4hep',
                  'Phase2C11M9',
-                 'Phase2C11_Ecal_Devel'
         ]
 
         internalUseMods = ['run2_common', 'run2_25ns_specific',