diff --git a/Configuration/Eras/python/Era_Run3_ckfPixelLessStep.py b/Configuration/Eras/python/Era_Run3_ckfPixelLessStep_cff.py similarity index 100% rename from Configuration/Eras/python/Era_Run3_ckfPixelLessStep.py rename to Configuration/Eras/python/Era_Run3_ckfPixelLessStep_cff.py diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index cfb95356acc48..78ac121eec5ed 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -64,7 +64,7 @@ 11634.914, 11650.914, 11601.0,11602.0,11603.0,11604.0,11605.0,11606.0,11607.0,11608.0,11609.0,11630.0,11643.0, 11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12034.0,11725.0,11925.0, - 11634.1,11634.5,11634.7,11634.91, + 11634.1,11634.5,11634.7,11634.71,11634.72,11634.91, 11650.501,11650.505, 11634.501,11634.505, 11634.511, diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 62339f5cbbc7a..4494d65500931 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -371,6 +371,44 @@ def condition_(self, fragment, stepList, key, hasHarvest): '--procModifiers': 'trackingMkFit' } +class UpgradeWorkflow_trackingRun3CkfPixelLessStep(UpgradeWorkflowTracking): + def setup__(self, step, stepName, stepDict, k, properties): + if 'Reco' in step and stepDict[step][k]['--era']=='Run3': + stepDict[stepName][k] = merge([{'--era': 'Run3_ckfPixelLessStep'}, stepDict[step][k]]) + def condition_(self, fragment, stepList, key, hasHarvest): + return '2021' in key +upgradeWFs['trackingRun3CkfPixelLessStep'] = UpgradeWorkflow_trackingRun3CkfPixelLessStep( + steps = [ + 'Reco', + 'RecoNano', + 'RecoGlobal', + 'RecoFakeHLT', + ], + suffix = '_trackingRun3CkfPixelLessStep', + offset = 0.71, +) + +class UpgradeWorkflow_trackingOnlyRun3CkfPixelLessStep(UpgradeWorkflowTracking): + def setup__(self, step, stepName, stepDict, k, properties): + if 'Reco' in step and stepDict[step][k]['--era']=='Run3': + stepDict[stepName][k] = merge([{'--era': 'Run3_ckfPixelLessStep'}, self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, stepDict[step][k]]) + def condition_(self, fragment, stepList, key, hasHarvest): + return '2021' in key +upgradeWFs['trackingOnlyRun3CkfPixelLessStep'] = UpgradeWorkflow_trackingOnlyRun3CkfPixelLessStep( + steps = [ + 'Reco', + 'HARVEST', + 'RecoNano', + 'HARVESTNano', + 'RecoFakeHLT', + 'HARVESTFakeHLT', + ], + suffix = '_trackingOnlyRun3CkfPixelLessStep', + offset = 0.72, +) +upgradeWFs['trackingOnlyRun3CkfPixelLessStep'].step3 = upgradeWFs['trackingOnly'].step3 + #DeepCore seeding for JetCore iteration workflow class UpgradeWorkflow_seedingDeepCore(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 08e937d53cfc5..37b14662ca1a5 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -34,6 +34,7 @@ def __init__(self): 'Run2_2018_highBetaStar', 'Run2_2018_noMkFit', 'Run3', + 'Run3_ckfPixelLessStep', 'Run3_noMkFit', 'Run3_pp_on_PbPb', 'Run3_dd4hep',