From 469a019b6e0eeb1fd4a317fca20ee06a76af7af0 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 13 Sep 2024 15:13:46 -0500 Subject: [PATCH 1/8] avoid spurious workflows --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 5534e45c5cb67..d4b1f31df3ba8 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -163,7 +163,9 @@ def workflow(self, workflows, num, fragment, stepList, key, hasHarvest): def workflow_(self, workflows, num, fragment, stepList, key): fragmentTmp = [fragment, key] if len(self.suffix)>0: fragmentTmp.append(self.suffix) - workflows[num+self.offset] = [ fragmentTmp, stepList ] + # avoid spurious workflows (no steps modified) + if self.offset==0 or workflows[num][1]!=stepList: + workflows[num+self.offset] = [ fragmentTmp, stepList ] def condition(self, fragment, stepList, key, hasHarvest): return False def preventReuse(self, stepName, stepDict, k): From 9f075916135a3954bab934c4c053072beba35665 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 13 Sep 2024 15:19:31 -0500 Subject: [PATCH 2/8] remove excessive workflows --- .../python/upgradeWorkflowComponents.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d4b1f31df3ba8..1c6b1de7ffec8 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2088,7 +2088,7 @@ def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = None def condition(self, fragment, stepList, key, hasHarvest): - return ('2021' in key or '2023' in key or '2026' in key) + return fragment=="TTbar_14TeV" and ('2021' in key or '2023' in key or '2026' in key) upgradeWFs['ECALComponent'] = UpgradeWorkflow_ECalComponent( suffix = '_ecalComponent', @@ -2574,7 +2574,7 @@ def setup_(self, step, stepName, stepDict, k, properties): else: stepDict[stepName][k] = merge([stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return ('2021FS' in key or '2023FS' in key) + return fragment=="TTbar_14TeV" and ('2021FS' in key or '2023FS' in key) upgradeWFs['Run3FStrackingOnly'] = UpgradeWorkflow_Run3FStrackingOnly( steps = [ 'Gen', @@ -2626,7 +2626,7 @@ def setup_(self, step, stepName, stepDict, k, properties): dd4hepGeom+=stepDict[step][k]['--geometry'] stepDict[stepName][k] = merge([{'--geometry' : dd4hepGeom, '--procModifiers': 'dd4hep'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return ('2021' in key or '2023' in key or '2026' in key) and ('FS' not in key) + return fragment=="TTbar_14TeV" and ('2021' in key or '2023' in key or '2026' in key) and ('FS' not in key) upgradeWFs['DD4hep'] = UpgradeWorkflow_DD4hep( steps = [ 'GenSim', @@ -2659,7 +2659,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'Run3' in stepDict[step][k]['--era'] and 'Fast' not in stepDict[step][k]['--era']: stepDict[stepName][k] = merge([{'--conditions': 'auto:phase1_2022_realistic', '--geometry': 'DB:Extended'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2021' in key and 'FS' not in key + return fragment=="TTbar_14TeV" and '2021' in key and 'FS' not in key upgradeWFs['DD4hepDB'] = UpgradeWorkflow_DD4hepDB( steps = [ 'GenSim', @@ -2695,7 +2695,7 @@ def setup_(self, step, stepName, stepDict, k, properties): tmp_eras = ','.join(tmp_eras) stepDict[stepName][k] = merge([{'--conditions': 'auto:phase1_2022_realistic_ddd', '--geometry': 'DB:Extended', '--era': tmp_eras}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return '2021' in key and 'FS' not in key + return fragment=="TTbar_14TeV" and '2021' in key and 'FS' not in key upgradeWFs['DDDDB'] = UpgradeWorkflow_DDDDB( steps = [ 'GenSim', From 88b26d34c58701f6b0b319fc6b708925448d0fcd Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 13 Sep 2024 15:24:52 -0500 Subject: [PATCH 3/8] remove unused parameters --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 1c6b1de7ffec8..af10124b517b4 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -531,7 +531,7 @@ def condition(self, fragment, stepList, key, hasHarvest): # WeightedMeanFitter vertexing workflows class UpgradeWorkflow_weightedVertex(UpgradeWorkflow): - def __init__(self, reco = {}, harvest = {}, **kwargs): + def __init__(self, **kwargs): # adapt the parameters for the UpgradeWorkflow init method super(UpgradeWorkflow_weightedVertex, self).__init__( steps = [ @@ -559,8 +559,6 @@ def __init__(self, reco = {}, harvest = {}, **kwargs): 'HARVESTNanoFakeHLT', ], **kwargs) - self.__reco = reco - self.__harvest = harvest def setup_(self, step, stepName, stepDict, k, properties): # temporarily remove trigger & downstream steps From 0ae700dc1ce7b97e25be918b78aee644af02eb98 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 13 Sep 2024 16:24:00 -0500 Subject: [PATCH 4/8] extend premix workflows to fastsim (run 3) --- .../python/relval_upgrade.py | 4 +- .../python/upgradeWorkflowComponents.py | 75 +++++++++++++++---- 2 files changed, 63 insertions(+), 16 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index e6adaab29c36f..3949d4573dea4 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -58,8 +58,8 @@ def makeStepName(key,frag,step,suffix): stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','HLT75e33'),specialWF.suffix)) # similar hacks for premixing if 'PMX' in specialType: - if 'GenSim' in step: - s = step.replace('GenSim','Premix')+'PU' # later processing requires to have PU here + if 'GenSim' in step or 'Gen' in step: + s = step.replace('GenSim','Premix').replace('Gen','Premix')+'PU' # later processing requires to have PU here if step in specialWF.PU: stepMade = stepMaker(key,'PREMIX',s,specialWF.suffix) # append for combined diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index af10124b517b4..79e38291ce64d 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2346,17 +2346,38 @@ def setupPU_(self, step, stepName, stepDict, k, properties): if "GenSim" in stepName: stepNamePmx = stepName.replace('GenSim','Premix') if not stepNamePmx in stepDict: stepDict[stepNamePmx] = {} - stepDict[stepNamePmx][k] = merge([ - { - '-s': 'GEN,SIM,DIGI:pdigi_valid', - '--datatier': 'PREMIX', - '--eventcontent': 'PREMIX', - '--procModifiers': 'premix_stage1' - }, - stepDict[stepName][k] - ]) - if "ProdLike" in self.suffix: - stepDict[stepNamePmx][k] = merge([{'-s': 'GEN,SIM,DIGI'},stepDict[stepNamePmx][k]]) + # avoid overwriting fastsim alternative + if not k in stepDict[stepNamePmx]: + stepDict[stepNamePmx][k] = merge([ + { + '-s': 'GEN,SIM,DIGI:pdigi_valid', + '--datatier': 'PREMIX', + '--eventcontent': 'PREMIX', + '--procModifiers': 'premix_stage1' + }, + stepDict[stepName][k] + ]) + if "ProdLike" in self.suffix: + stepDict[stepNamePmx][k] = merge([{'-s': 'GEN,SIM,DIGI'},stepDict[stepNamePmx][k]]) + # setup for stage 1 fastsim + elif "Gen" in stepName: + stepNamePmx = stepName.replace('Gen','Premix') + if not stepNamePmx in stepDict: stepDict[stepNamePmx] = {} + # avoid overwriting fullsim alternative + if not k in stepDict[stepNamePmx]: + stepDict[stepNamePmx][k] = merge([ + { + '-s': 'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid', + '--fast':'', + '--datatier': 'PREMIX', + '--eventcontent': 'PREMIX', + '--procModifiers': 'premix_stage1' + }, + stepDict[stepName][k] + ]) + if "ProdLike" in self.suffix: + # todo + pass # setup for stage 2 elif "Digi" in step or "Reco" in step: # go back to non-PU step version @@ -2382,13 +2403,35 @@ def setupPU_(self, step, stepName, stepDict, k, properties): else: d["--procModifiers"] = "premix_stage2" stepDict[stepName][k] = d - # Increase the input file step number by one for Nano in combined stage1+stage2 + # setup for stage 2 fastsim + elif "FastSimRun3" in step: + # go back to non-PU step version + d = merge([stepDict[self.getStepName(step)][k]]) + if d is None: return + tmpsteps = [] + for s in d["-s"].split(","): + if s == "DIGI" or "DIGI:" in s: + tmpsteps.extend([s, "DATAMIX"]) + else: + tmpsteps.append(s) + d = merge([{"-s" : ",".join(tmpsteps), + "--datamix" : "PreMix"}, + d]) + if "--procModifiers" in d: + d["--procModifiers"] += ",premix_stage2" + else: + d["--procModifiers"] = "premix_stage2" + # for combined stage1+stage2 + if "_PMXS1S2" in self.suffix: + d = merge([digiPremixLocalPileup, d]) + stepDict[stepName][k] = d + # separate nano step now only used in ProdLike workflows for Run3/Phase2 elif "Nano"==step: # go back to non-PU step version d = merge([stepDict[self.getStepName(step)][k]]) - if "--filein" in d: + if "_PMXS1S2" in self.suffix and "--filein" in d: filein = d["--filein"] - m = re.search("step(?P\d+)_", filein) + m = re.search("step(?P\\d+)_", filein) if m: d["--filein"] = filein.replace(m.group(), "step%d_"%(int(m.group("ind"))+1)) stepDict[stepName][k] = d @@ -2412,6 +2455,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): steps = [ ], PU = [ + 'Gen', 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', @@ -2432,6 +2476,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNano', 'RecoNanoFakeHLT', 'Nano', + 'FastSimRun3', ], suffix = '_PMXS2', offset = 0.98, @@ -2440,6 +2485,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): upgradeWFs['PMXS1S2'] = UpgradeWorkflowPremix( steps = [], PU = [ + 'Gen', 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', @@ -2452,6 +2498,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNano', 'RecoNanoFakeHLT', 'Nano', + 'FastSimRun3', ], suffix = '_PMXS1S2', offset = 0.99, From 04dec0b4ae357a62c4bd5a1855e09d7f69deb067 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Sat, 14 Sep 2024 10:55:31 -0500 Subject: [PATCH 5/8] reorg for better full-fast separation, handle harvest --- .../python/upgradeWorkflowComponents.py | 144 +++++++++--------- 1 file changed, 74 insertions(+), 70 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 79e38291ce64d..bce65001ee78e 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2342,29 +2342,12 @@ def setup_(self, step, stepName, stepDict, k, properties): # just copy steps stepDict[stepName][k] = merge([stepDict[step][k]]) def setupPU_(self, step, stepName, stepDict, k, properties): - # setup for stage 1 - if "GenSim" in stepName: - stepNamePmx = stepName.replace('GenSim','Premix') - if not stepNamePmx in stepDict: stepDict[stepNamePmx] = {} - # avoid overwriting fastsim alternative - if not k in stepDict[stepNamePmx]: - stepDict[stepNamePmx][k] = merge([ - { - '-s': 'GEN,SIM,DIGI:pdigi_valid', - '--datatier': 'PREMIX', - '--eventcontent': 'PREMIX', - '--procModifiers': 'premix_stage1' - }, - stepDict[stepName][k] - ]) - if "ProdLike" in self.suffix: - stepDict[stepNamePmx][k] = merge([{'-s': 'GEN,SIM,DIGI'},stepDict[stepNamePmx][k]]) - # setup for stage 1 fastsim - elif "Gen" in stepName: - stepNamePmx = stepName.replace('Gen','Premix') - if not stepNamePmx in stepDict: stepDict[stepNamePmx] = {} - # avoid overwriting fullsim alternative - if not k in stepDict[stepNamePmx]: + # fastsim version + if 'FS' in k: + # setup for stage 1 fastsim + if "Gen" in stepName: + stepNamePmx = stepName.replace('Gen','Premix') + if not stepNamePmx in stepDict: stepDict[stepNamePmx] = {} stepDict[stepNamePmx][k] = merge([ { '-s': 'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid', @@ -2378,12 +2361,11 @@ def setupPU_(self, step, stepName, stepDict, k, properties): if "ProdLike" in self.suffix: # todo pass - # setup for stage 2 - elif "Digi" in step or "Reco" in step: - # go back to non-PU step version - d = merge([stepDict[self.getStepName(step)][k]]) - if d is None: return - if "Digi" in step: + # setup for stage 2 fastsim + elif "FastSimRun3" in step: + # go back to non-PU step version + d = merge([stepDict[self.getStepName(step)][k]]) + if d is None: return tmpsteps = [] for s in d["-s"].split(","): if s == "DIGI" or "DIGI:" in s: @@ -2391,52 +2373,72 @@ def setupPU_(self, step, stepName, stepDict, k, properties): else: tmpsteps.append(s) d = merge([{"-s" : ",".join(tmpsteps), - "--datamix" : "PreMix", - "--procModifiers": "premix_stage2"}, + "--datamix" : "PreMix"}, d]) - # for combined stage1+stage2 - if "_PMXS1S2" in self.suffix: - d = merge([digiPremixLocalPileup, d]) - elif "Reco" in step: if "--procModifiers" in d: d["--procModifiers"] += ",premix_stage2" else: d["--procModifiers"] = "premix_stage2" - stepDict[stepName][k] = d - # setup for stage 2 fastsim - elif "FastSimRun3" in step: - # go back to non-PU step version - d = merge([stepDict[self.getStepName(step)][k]]) - if d is None: return - tmpsteps = [] - for s in d["-s"].split(","): - if s == "DIGI" or "DIGI:" in s: - tmpsteps.extend([s, "DATAMIX"]) - else: - tmpsteps.append(s) - d = merge([{"-s" : ",".join(tmpsteps), - "--datamix" : "PreMix"}, - d]) - if "--procModifiers" in d: - d["--procModifiers"] += ",premix_stage2" - else: - d["--procModifiers"] = "premix_stage2" - # for combined stage1+stage2 - if "_PMXS1S2" in self.suffix: - d = merge([digiPremixLocalPileup, d]) - stepDict[stepName][k] = d - # separate nano step now only used in ProdLike workflows for Run3/Phase2 - elif "Nano"==step: - # go back to non-PU step version - d = merge([stepDict[self.getStepName(step)][k]]) - if "_PMXS1S2" in self.suffix and "--filein" in d: - filein = d["--filein"] - m = re.search("step(?P\\d+)_", filein) - if m: - d["--filein"] = filein.replace(m.group(), "step%d_"%(int(m.group("ind"))+1)) - stepDict[stepName][k] = d - # run2/3 WFs use Nano (not NanoPU) in PU WF - stepDict[self.getStepName(step)][k] = merge([d]) + # for combined stage1+stage2 + if "_PMXS1S2" in self.suffix: + d = merge([digiPremixLocalPileup, d]) + stepDict[stepName][k] = d + elif "HARVESTFastRun3" in step: + # increment input step number + stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'},stepDict[stepName][k]]) + else: + # setup for stage 1 + if "GenSim" in stepName: + stepNamePmx = stepName.replace('GenSim','Premix') + if not stepNamePmx in stepDict: stepDict[stepNamePmx] = {} + stepDict[stepNamePmx][k] = merge([ + { + '-s': 'GEN,SIM,DIGI:pdigi_valid', + '--datatier': 'PREMIX', + '--eventcontent': 'PREMIX', + '--procModifiers': 'premix_stage1' + }, + stepDict[stepName][k] + ]) + if "ProdLike" in self.suffix: + stepDict[stepNamePmx][k] = merge([{'-s': 'GEN,SIM,DIGI'},stepDict[stepNamePmx][k]]) + # setup for stage 2 + elif "Digi" in step or "Reco" in step: + # go back to non-PU step version + d = merge([stepDict[self.getStepName(step)][k]]) + if d is None: return + if "Digi" in step: + tmpsteps = [] + for s in d["-s"].split(","): + if s == "DIGI" or "DIGI:" in s: + tmpsteps.extend([s, "DATAMIX"]) + else: + tmpsteps.append(s) + d = merge([{"-s" : ",".join(tmpsteps), + "--datamix" : "PreMix", + "--procModifiers": "premix_stage2"}, + d]) + # for combined stage1+stage2 + if "_PMXS1S2" in self.suffix: + d = merge([digiPremixLocalPileup, d]) + elif "Reco" in step: + if "--procModifiers" in d: + d["--procModifiers"] += ",premix_stage2" + else: + d["--procModifiers"] = "premix_stage2" + stepDict[stepName][k] = d + # separate nano step now only used in ProdLike workflows for Run3/Phase2 + elif "Nano"==step: + # go back to non-PU step version + d = merge([stepDict[self.getStepName(step)][k]]) + if "_PMXS1S2" in self.suffix and "--filein" in d: + filein = d["--filein"] + m = re.search("step(?P\\d+)_", filein) + if m: + d["--filein"] = filein.replace(m.group(), "step%d_"%(int(m.group("ind"))+1)) + stepDict[stepName][k] = d + # run2/3 WFs use Nano (not NanoPU) in PU WF + stepDict[self.getStepName(step)][k] = merge([d]) def condition(self, fragment, stepList, key, hasHarvest): if not 'PU' in key: return False @@ -2477,6 +2479,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNanoFakeHLT', 'Nano', 'FastSimRun3', + 'HARVESTFastRun3', ], suffix = '_PMXS2', offset = 0.98, @@ -2499,6 +2502,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNanoFakeHLT', 'Nano', 'FastSimRun3', + 'HARVESTFastRun3', ], suffix = '_PMXS1S2', offset = 0.99, From f28e98d81f31fd6b0476281d69897fe03f6e7d10 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 27 Sep 2024 13:27:55 -0500 Subject: [PATCH 6/8] remove redundant step number change --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index bce65001ee78e..9105e4aab7cd5 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2556,8 +2556,6 @@ def setup_(self, step, stepName, stepDict, k, properties): "--eventcontent": "PREMIXRAW"}, d]) stepDict[stepName][k] = d - if 'Nano'==step: - stepDict[stepName][k] = merge([{'--filein':'file:step5.root','-s':'NANO','--datatier':'NANOAODSIM','--eventcontent':'NANOEDMAODSIM'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): # use both conditions return UpgradeWorkflowPremix.condition(self, fragment, stepList, key, hasHarvest) and UpgradeWorkflow_ProdLike.condition(self, fragment, stepList, key, hasHarvest) From 40b15161fce65482b6ce6217d9208ba8d5abeda7 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 27 Sep 2024 13:52:00 -0500 Subject: [PATCH 7/8] fix mistake in regex --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 9105e4aab7cd5..fd4bf89ede869 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2433,9 +2433,9 @@ def setupPU_(self, step, stepName, stepDict, k, properties): d = merge([stepDict[self.getStepName(step)][k]]) if "_PMXS1S2" in self.suffix and "--filein" in d: filein = d["--filein"] - m = re.search("step(?P\\d+)_", filein) + m = re.search("step(?P\\d+)", filein) if m: - d["--filein"] = filein.replace(m.group(), "step%d_"%(int(m.group("ind"))+1)) + d["--filein"] = filein.replace(m.group(), "step%d"%(int(m.group("ind"))+1)) stepDict[stepName][k] = d # run2/3 WFs use Nano (not NanoPU) in PU WF stepDict[self.getStepName(step)][k] = merge([d]) From d616785330973d447f43c5bd98989da6015ba187 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Tue, 1 Oct 2024 15:48:06 -0500 Subject: [PATCH 8/8] restrict dd4hep special workflow to Phase 2; restore for all fragments --- .../python/upgradeWorkflowComponents.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index fd4bf89ede869..c74283dbe89c4 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2663,17 +2663,12 @@ def condition(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflow_DD4hep(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): - if 'Run3' in stepDict[step][k]['--era'] and 'Fast' not in stepDict[step][k]['--era']: - if '2023' in stepDict[step][k]['--conditions']: - stepDict[stepName][k] = merge([{'--geometry': 'DD4hepExtended2023'}, stepDict[step][k]]) - else: - stepDict[stepName][k] = merge([{'--geometry': 'DD4hepExtended2021'}, stepDict[step][k]]) - elif 'Phase2' in stepDict[step][k]['--era']: + if 'Phase2' in stepDict[step][k]['--era']: dd4hepGeom="DD4hep" dd4hepGeom+=stepDict[step][k]['--geometry'] stepDict[stepName][k] = merge([{'--geometry' : dd4hepGeom, '--procModifiers': 'dd4hep'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and ('2021' in key or '2023' in key or '2026' in key) and ('FS' not in key) + return ('2026' in key) and ('FS' not in key) upgradeWFs['DD4hep'] = UpgradeWorkflow_DD4hep( steps = [ 'GenSim',