Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement step skipping more consistently for Patatrack workflows #36341

Merged
merged 1 commit into from
Dec 3, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ def __init__(self, digi = {}, reco = {}, harvest = {}, **kwargs):
'HARVESTGlobal',
'RecoNano',
'HARVESTNano',
'Nano',
'ALCA',
],
PU = [],
**kwargs)
Expand All @@ -467,14 +469,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
]
result = any(selected) and hasHarvest

# skip ALCA and Nano steps (but not RecoNano or HARVESTNano for Run3)
for skip in copy(stepList):
if ("ALCA" in skip) or ("Nano"==skip):
stepList.remove(skip)
return result

def setup_(self, step, stepName, stepDict, k, properties):
if 'Digi' in step:
# skip ALCA and Nano steps (but not RecoNano or HARVESTNano for Run3)
if 'ALCA' in step or 'Nano'==step:
stepDict[stepName][k] = None
elif 'Digi' in step:
if self.__digi is None:
stepDict[stepName][k] = None
else:
Expand Down