From 074b950711f79113176d2580fff3a90f50ddeed7 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Wed, 23 Mar 2022 16:39:11 +0100 Subject: [PATCH 1/4] Add HLT Phase2 to D88 --- .../PyReleaseValidation/python/relval_steps.py | 12 +++++++++++- .../python/upgradeWorkflowComponents.py | 11 +++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e462ca4f0bf00..f966703fdafeb 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3594,7 +3594,17 @@ def gen2021HiMix(fragment,howMuch): '--eventcontent':'FEVTDEBUGHLT', '--geometry' : geom } - + + upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:75e33', + '--processName':'HLTX', + '--conditions':gt, + '--datatier':'FEVTDEBUGHLT', + '-n':'10', + '--eventcontent':'FEVTDEBUGHLT', + '--geometry' : geom, + '--filein':'file:step3.root' + } + upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM', '--conditions':gt, '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index c802b614c345b..4e2a6065a84d7 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -157,10 +157,13 @@ def setup_(self, step, stepName, stepDict, k, properties): cust=properties.get('Custom', None) era=properties.get('Era', None) modifier=properties.get('ProcessModifier',None) + geometry=properties.get('Geom',None) if cust is not None: stepDict[stepName][k]['--customise']=cust if era is not None: stepDict[stepName][k]['--era']=era if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier + if geometry == 'Extended2026D88' and step == 'HARVESTGlobal': + stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return True upgradeWFs['baseline'] = UpgradeWorkflow_baseline( @@ -185,6 +188,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'ALCA', 'Nano', 'MiniAOD', + 'HLT75e33', ], PU = [ 'DigiTrigger', @@ -200,6 +204,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HARVESTGlobal', 'MiniAOD', 'Nano', + 'HLT75e33', ], suffix = '', offset = 0.0, @@ -2012,7 +2017,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'], + 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal','HLT75e33', 'HARVESTGlobal'], }, '2026D89' : { 'Geom' : 'Extended2026D89', @@ -2040,7 +2045,9 @@ def condition(self, fragment, stepList, key, hasHarvest): # standard PU sequences for key in list(upgradeProperties[2026].keys()): upgradeProperties[2026][key+'PU'] = deepcopy(upgradeProperties[2026][key]) - upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU', 'HARVESTGlobalPU'] + upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU'] + \ + (['HLT75e33'] if 'HLT75e33' in upgradeProperties[2026][key]['ScenToRun'] else []) + \ + ['HARVESTGlobalPU'] # for relvals defaultDataSets = {} From 83bcef8b2a9f87aafb54f6392583c793becc58a5 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 24 Mar 2022 10:21:58 +0100 Subject: [PATCH 2/4] update datatier --- Configuration/PyReleaseValidation/python/relval_steps.py | 5 ++--- .../python/upgradeWorkflowComponents.py | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index f966703fdafeb..0b846e4f095c5 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3598,11 +3598,10 @@ def gen2021HiMix(fragment,howMuch): upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:75e33', '--processName':'HLTX', '--conditions':gt, - '--datatier':'FEVTDEBUGHLT', + '--datatier':'GEN-SIM-RECO', '-n':'10', '--eventcontent':'FEVTDEBUGHLT', - '--geometry' : geom, - '--filein':'file:step3.root' + '--geometry' : geom } upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 4e2a6065a84d7..f140a50a9a724 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -162,8 +162,11 @@ def setup_(self, step, stepName, stepDict, k, properties): if era is not None: stepDict[stepName][k]['--era']=era if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier - if geometry == 'Extended2026D88' and step == 'HARVESTGlobal': - stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) + if geometry == 'Extended2026D88': #Hack to make proper D88 workflow after including HLT75e33 ste (after RECO). + if step == 'RecoGlobal': + stepDict[stepName][k] = merge([{'--datatier':'FEVT,MINIAODSIM,DQMIO'}, stepDict[step][k]]) + if step == 'HARVESTGlobal': + stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return True upgradeWFs['baseline'] = UpgradeWorkflow_baseline( From aa3ce460b07ecf917568827afbf5e9d64040a9cd Mon Sep 17 00:00:00 2001 From: Norraphat Date: Mon, 11 Apr 2022 18:56:40 +0200 Subject: [PATCH 3/4] update wf .75 --- .../PyReleaseValidation/python/relval_2026.py | 1 + .../python/relval_upgrade.py | 4 ++ .../python/upgradeWorkflowComponents.py | 39 ++++++++++++++----- .../scripts/runTheMatrix.py | 1 + 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index 12cc3e6860394..48a43da9218df 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -33,6 +33,7 @@ numWFIB.extend([38634.0]) #2026D86 numWFIB.extend([39034.0]) #2026D87 numWFIB.extend([39434.0,39434.911,39434.103]) #2026D88 DDD XML, DD4hep XML, aging +numWFIB.extend([39434.75]) #2026D88 with HLT75e33 numWFIB.extend([39661.97]) #2026D88 premixing stage1 (NuGun+PU) numWFIB.extend([39434.5,39434.9,39434.501,39434.502]) #2026D88 pixelTrackingOnly, vector hits, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU numWFIB.extend([39634.99,39634.999]) #2026D88 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 7467312510e5d..b6f68ccb95916 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -49,6 +49,10 @@ def makeStepName(key,frag,step,suffix): stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('RecoNano','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix)) if 'RecoNano' in step: stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoNano','Nano'),specialWF.suffix)) + # hack to add extra HLT75e33 step for Phase-2 + if 'HLT75e33' in specialType: + if 'RecoGlobal' in step: + 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: diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index f140a50a9a724..24448da11eb31 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -157,16 +157,10 @@ def setup_(self, step, stepName, stepDict, k, properties): cust=properties.get('Custom', None) era=properties.get('Era', None) modifier=properties.get('ProcessModifier',None) - geometry=properties.get('Geom',None) if cust is not None: stepDict[stepName][k]['--customise']=cust if era is not None: stepDict[stepName][k]['--era']=era if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier - if geometry == 'Extended2026D88': #Hack to make proper D88 workflow after including HLT75e33 ste (after RECO). - if step == 'RecoGlobal': - stepDict[stepName][k] = merge([{'--datatier':'FEVT,MINIAODSIM,DQMIO'}, stepDict[step][k]]) - if step == 'HARVESTGlobal': - stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return True upgradeWFs['baseline'] = UpgradeWorkflow_baseline( @@ -1200,6 +1194,33 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.21, ) +class UpgradeWorkflow_HLT75e33(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + if 'HARVEST' in step: + stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) + else: + stepDict[stepName][k] = merge([stepDict[step][k]]) + def condition(self, fragment, stepList, key, hasHarvest): + return fragment=="TTbar_14TeV" and '2026' in key +upgradeWFs['HLT75e33'] = UpgradeWorkflow_HLT75e33( + steps = [ + 'GenSimHLBeamSpot14', + 'DigiTrigger', + 'RecoGlobal', + 'HLT75e33', + 'HARVESTGlobal', + ], + PU = [ + 'GenSimHLBeamSpot14', + 'DigiTrigger', + 'RecoGlobal', + 'HLT75e33', + 'HARVESTGlobal', + ], + suffix = '_HLT75e33', + offset = 0.75, +) + class UpgradeWorkflow_Neutron(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if 'GenSim' in step: @@ -2020,7 +2041,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal','HLT75e33', 'HARVESTGlobal'], + 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'], }, '2026D89' : { 'Geom' : 'Extended2026D89', @@ -2048,9 +2069,7 @@ def condition(self, fragment, stepList, key, hasHarvest): # standard PU sequences for key in list(upgradeProperties[2026].keys()): upgradeProperties[2026][key+'PU'] = deepcopy(upgradeProperties[2026][key]) - upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU'] + \ - (['HLT75e33'] if 'HLT75e33' in upgradeProperties[2026][key]['ScenToRun'] else []) + \ - ['HARVESTGlobalPU'] + upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU', 'HARVESTGlobalPU'] # for relvals defaultDataSets = {} diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index d81dbcfa7cbe0..858f0e641a69a 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -100,6 +100,7 @@ def runSelected(opt): 28234.0, #2026D60 (exercise HF nose) 35034.0, #2026D77 ttbar 39434.0, #2026D88 ttbar (2022 new baseline) + 39434.75, #2026D88 ttbar with HLT75e33 #39434.911, #2026D88 ttbar DD4hep XML 39634.999, #2026D88 ttbar premixing stage1+stage2, PU50 39496.0, #CE_E_Front_120um D88 From b94315207157b4e5698b969566b953ff1adb98c7 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Tue, 12 Apr 2022 05:48:48 +0200 Subject: [PATCH 4/4] update readme and hlt menu --- Configuration/PyReleaseValidation/README.md | 1 + Configuration/PyReleaseValidation/python/relval_steps.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index 6bccefb63c85b..f851c33976167 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -59,6 +59,7 @@ The offsets currently in use are: * 0.21: Production-like sequence * 0.24: 0 Tesla (Run-2, Run-3) * 0.61: `phase2_ecal_devel` era +* 0.75: Phase-2 HLT * 0.91: Track DNN modifier * 0.97: Premixing stage1 * 0.98: Premixing stage2 diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 0b846e4f095c5..1b962d9ccf720 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3595,10 +3595,10 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : geom } - upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:75e33', + upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:@relval2026', '--processName':'HLTX', '--conditions':gt, - '--datatier':'GEN-SIM-RECO', + '--datatier':'FEVT', '-n':'10', '--eventcontent':'FEVTDEBUGHLT', '--geometry' : geom