From d4b963d64a1dd7ccfaf48498f2c633de770d266d Mon Sep 17 00:00:00 2001 From: mmusich Date: Wed, 22 Nov 2023 13:26:15 +0100 Subject: [PATCH 1/2] move relval2023 autoHLT key to use 2023v12 frozen menu and create relval2024 autoHLT key (currently pointing to GRun) --- Configuration/HLT/python/autoHLT.py | 3 ++- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py index 89fa8e094c8cf..110e0de57ac68 100644 --- a/Configuration/HLT/python/autoHLT.py +++ b/Configuration/HLT/python/autoHLT.py @@ -11,7 +11,8 @@ 'relval2017' : 'Fake2', 'relval2018' : 'Fake2', 'relval2022' : 'Fake2', - 'relval2023' : 'GRun', + 'relval2023' : '2023v12', + 'relval2024' : 'GRun', 'relval2026' : '75e33', 'test' : 'GRun', } diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 442733ea10c8f..d392ea22a8399 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2631,7 +2631,7 @@ def condition(self, fragment, stepList, key, hasHarvest): '2024' : { 'Geom' : 'DB:Extended', 'GT' : 'auto:phase1_2024_realistic', - 'HLTmenu': '@relval2023', + 'HLTmenu': '@relval2024', 'Era' : 'Run3', 'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision', 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'], From eed339802764c42868ca41c964e4ee6af9db7afb Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 23 Nov 2023 09:27:27 +0100 Subject: [PATCH 2/2] move 2023 real data workflows to run the @relval2024 (GRun) key - temporary solution until we don't have proper 2024 data to run on --- Configuration/PyReleaseValidation/python/relval_steps.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 162272cebf54d..ce91fcf087d81 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2074,10 +2074,12 @@ def lhegensim2018ml(fragment,howMuch): hltKey2022='relval2022' steps['HLTDR3_2022']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2022,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] ) -hltKey2023='relval2023' -steps['HLTDR3_2023']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2023,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3_2023'},steps['HLTD'] ] ) +hltKey2023='relval2023' # currently points to Fake2 -steps['HLTDR3_2023B']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2023,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] ) +hltKey2024='relval2024' # currently points to GRUN (hacky solution to keep running GRun on real data) +steps['HLTDR3_2023']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2024,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3_2023'},steps['HLTD'] ] ) + +steps['HLTDR3_2023B']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2024,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] ) steps['HLTDR3_HI2023ARawprime']=merge([{'-s':'L1REPACK:Full,HLT:HIon'}, {'--conditions':'auto:run3_hlt_HIon'},