From d63c30bde99e5bfe1b995657a6c29dbdf4f36e82 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 21 Oct 2020 21:14:04 -0500 Subject: [PATCH 1/3] add ecal devel special workflow --- .../python/upgradeWorkflowComponents.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 348256ce9258b..6342661b88668 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -584,6 +584,26 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.6, ) +class UpgradeWorkflow_ecalDevel(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + stepDict[stepName][k] = merge([{'--era': stepDict[step][k]['--era']+',phase2_ecal_devel'}, 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'] From 7f236446a3095e48358b679ede432b2fdd1198be Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Oct 2020 12:39:16 -0500 Subject: [PATCH 2/3] temporarily remove trigger and downstream steps for ecal devel wf --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 6342661b88668..69b9d379771ec 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -586,7 +586,11 @@ def condition(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflow_ecalDevel(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): - stepDict[stepName][k] = merge([{'--era': stepDict[step][k]['--era']+',phase2_ecal_devel'}, stepDict[step][k]]) + # 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( From 7d7fa8dfffa5923c6be7f00dd6b43cbe50ae3afa Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Oct 2020 12:43:11 -0500 Subject: [PATCH 3/3] remove unneeded Era --- Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py | 7 ------- Configuration/StandardSequences/python/Eras.py | 1 - 2 files changed, 8 deletions(-) delete mode 100644 Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py diff --git a/Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py b/Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py deleted file mode 100644 index 0d2e556629e82..0000000000000 --- a/Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.Era_Phase2C11_cff import Phase2C11 -from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel - -Phase2C11_Ecal_Devel = cms.ModifierChain(Phase2C11,phase2_ecal_devel) - diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 55b350d3c92a2..1517cfd8204ef 100644 --- 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',