From 6370ca81bca2d5404c89fbc8247f9a20421fcbf1 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 28 Oct 2022 18:57:53 +0200 Subject: [PATCH 1/2] add protection for alca step in the patatrack phase-2 workflows --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 54db5bf1522e8..06033728cb9fb 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -630,6 +630,7 @@ def __init__(self, digi = {}, reco = {}, harvest = {}, **kwargs): 'HARVESTNano', 'Nano', 'ALCA', + 'ALCAPhase2' ], PU = [], **kwargs) From d6b34b15c303b9342b7d626a91237d184b542f80 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 28 Oct 2022 22:50:42 +0200 Subject: [PATCH 2/2] add protection for alca step in the prodlike and pixel-tracking only phase-2 workflows --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 06033728cb9fb..6c5c6ee6dd763 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -335,6 +335,8 @@ def condition_(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflow_pixelTrackingOnly(UpgradeWorkflowTracking): def setup__(self, step, stepName, stepDict, k, properties): if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + # skip ALCA step as products might not be available + elif 'ALCA' in step: stepDict[stepName][k] = None elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) def condition_(self, fragment, stepList, key, hasHarvest): return ('2017' in key or '2018' in key or '2021' in key or '2026' in key) and ('FS' not in key) @@ -348,6 +350,8 @@ def condition_(self, fragment, stepList, key, hasHarvest): 'HARVESTNano', 'RecoFakeHLT', 'HARVESTFakeHLT', + 'ALCA', + 'ALCAPhase2' ], suffix = '_pixelTrackingOnly', offset = 0.5, @@ -1295,6 +1299,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HARVESTNano', 'MiniAOD', 'ALCA', + 'ALCAPhase2', 'Nano', ], PU = [ @@ -1309,6 +1314,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HARVESTNano', 'MiniAOD', 'ALCA', + 'ALCAPhase2', 'Nano', ], suffix = '_ProdLike',