From 18fa2e6ac99a0d386dc5d3eb5f8f43f0daec2e7f 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 b22c172caba67..318e570ba97c5 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -166,7 +166,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 741e106379783aac92f7110a0082db0c6dc296b7 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 318e570ba97c5..de3d455f6e78c 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2266,7 +2266,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', @@ -2752,7 +2752,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 ('FS' in key) + return fragment=="TTbar_14TeV" and ('FS' in key) upgradeWFs['Run3FStrackingOnly'] = UpgradeWorkflow_Run3FStrackingOnly( steps = [ 'Gen', @@ -2804,7 +2804,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', @@ -2837,7 +2837,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', @@ -2873,7 +2873,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 9c43dd6fe18a35d7852bb172b2e9b6139f142d8a 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 de3d455f6e78c..a1f66cfa555cf 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -564,7 +564,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 = [ @@ -592,8 +592,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 1862a94c7740f6adee4863ee666a4a85639ca165 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 | 73 +++++++++++++++---- 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 7728919e058cd..9c1fed0fe384e 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -71,8 +71,8 @@ def notForGenOnly(key,specialType): 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 a1f66cfa555cf..ca2a107482bf8 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2524,17 +2524,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 @@ -2560,11 +2581,33 @@ 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) if m: @@ -2590,6 +2633,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): steps = [ ], PU = [ + 'Gen', 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', @@ -2610,6 +2654,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNano', 'RecoNanoFakeHLT', 'Nano', + 'FastSimRun3', ], suffix = '_PMXS2', offset = 0.98, @@ -2618,6 +2663,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): upgradeWFs['PMXS1S2'] = UpgradeWorkflowPremix( steps = [], PU = [ + 'Gen', 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', @@ -2630,6 +2676,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNano', 'RecoNanoFakeHLT', 'Nano', + 'FastSimRun3', ], suffix = '_PMXS1S2', offset = 0.99, From acb7e149031448bcde3bd12bbec21fb1d94c560c 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 ca2a107482bf8..7baa14e7a89d7 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2520,29 +2520,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', @@ -2556,12 +2539,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: @@ -2569,52 +2551,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 @@ -2655,6 +2657,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNanoFakeHLT', 'Nano', 'FastSimRun3', + 'HARVESTFastRun3', ], suffix = '_PMXS2', offset = 0.98, @@ -2677,6 +2680,7 @@ def workflow_(self, workflows, num, fragment, stepList, key): 'RecoNanoFakeHLT', 'Nano', 'FastSimRun3', + 'HARVESTFastRun3', ], suffix = '_PMXS1S2', offset = 0.99, From 809035ef0cc7af6b691d651d072ae08fcd5fa09d 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 7baa14e7a89d7..93d9ce24e0d31 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2734,8 +2734,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 ad685bb6d645dd1cff2c93fe44b4bc6d4832459a 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 93d9ce24e0d31..2d053b1cb98d2 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2611,9 +2611,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 1ca60724624a26c1cfb3fdb8c1b425487dea5512 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 2d053b1cb98d2..ca598ab630c1e 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2841,17 +2841,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',