From 2f601906204cabf3144bcdbf43a460377e532bed Mon Sep 17 00:00:00 2001 From: Marco Musich Date: Thu, 21 May 2026 18:38:07 +0200 Subject: [PATCH 1/2] add phase-2 nano workflows to the nano matrix --- .../PyReleaseValidation/python/relval_nano.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/relval_nano.py b/Configuration/PyReleaseValidation/python/relval_nano.py index 8c729c0881d0b..83e8e77b149bf 100644 --- a/Configuration/PyReleaseValidation/python/relval_nano.py +++ b/Configuration/PyReleaseValidation/python/relval_nano.py @@ -716,3 +716,14 @@ def next(self, index: int = None) -> None: workflows[_wfn()] = ['', ['DYToll01234Jets_5f_LO_MLM_Madgraph_LHE_13TeV', 'Hadronizer_TuneCP5_13TeV_MLM_5f_max4j_LHE_pythia8', 'NANOGENFromGen']] workflows[_wfn()] = ['', ['TTbar_Pow_LHE_13TeV', 'Hadronizer_TuneCP5_13TeV_powhegEmissionVeto2p_pythia8', 'NANOGENFromGen']] + +################################################################ +# Phase-2 HLT with NANO +from Configuration.PyReleaseValidation.relval_upgrade import workflows as _upgrade_workflows +from Configuration.PyReleaseValidation.relval_Run4 import prefixDet + +# Phase-2 HLT NANO workflows +workflows[prefixDet+34.759] = _upgrade_workflows[prefixDet+34.759] # HLT75e33 + NANO +workflows[prefixDet+34.7591] = _upgrade_workflows[prefixDet+34.7591] # HLT75e33 + NANO (including validation) +workflows[prefixDet+34.772] = _upgrade_workflows[prefixDet+34.772] # NGTScouting + NANO +workflows[prefixDet+34.773] = _upgrade_workflows[prefixDet+34.773] # NGTScouting + NANO (including validation) From 0be8c9440c8c1ffee9db8fafd75d834bee4f648d Mon Sep 17 00:00:00 2001 From: Marco Musich Date: Fri, 22 May 2026 09:20:17 +0200 Subject: [PATCH 2/2] drop GEN-SIM-DIGI-RAW output from nano- workflows in the ph2_hlt matrix --- .../python/upgradeWorkflowComponents.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d051170d7d246..24fad6f7a1862 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2102,8 +2102,8 @@ def condition(self, fragment, stepList, key, hasHarvest): ) upgradeWFs['HLTPhase2WithNano'].step2 = { '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33,NANO:@Phase2HLT', - '--datatier':'GEN-SIM-DIGI-RAW,NANOAODSIM', - '--eventcontent':'FEVTDEBUGHLT,NANOAODSIM' + '--datatier':'NANOAODSIM', + '--eventcontent':'NANOAODSIM' } upgradeWFs['HLTPhase2WithNanoValid'] = deepcopy(upgradeWFs['HLTPhase2WithNano']) @@ -2111,8 +2111,8 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['HLTPhase2WithNanoValid'].offset = 0.7591 upgradeWFs['HLTPhase2WithNanoValid'].step2 = { '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33,VALIDATION:@hltValidation,NANO:@Phase2HLTVal', - '--datatier':'GEN-SIM-DIGI-RAW,NANOAODSIM', - '--eventcontent':'FEVTDEBUGHLT,NANOAODSIM' + '--datatier':'NANOAODSIM', + '--eventcontent':'NANOAODSIM' } upgradeWFs['NGTScoutingWithNano'] = deepcopy(upgradeWFs['HLTPhase2WithNano']) @@ -2120,9 +2120,9 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['NGTScoutingWithNano'].offset = 0.772 upgradeWFs['NGTScoutingWithNano'].step2 = { '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,NANO:@NGTScouting', - '--datatier':'GEN-SIM-DIGI-RAW,NANOAODSIM', + '--datatier':'NANOAODSIM', '--procModifiers': 'ngtScouting', - '--eventcontent':'FEVTDEBUGHLT,NANOAODSIM' + '--eventcontent':'NANOAODSIM' } upgradeWFs['NGTScoutingWithNanoValid'] = deepcopy(upgradeWFs['HLTPhase2WithNano']) @@ -2130,9 +2130,9 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['NGTScoutingWithNanoValid'].offset = 0.773 upgradeWFs['NGTScoutingWithNanoValid'].step2 = { '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,VALIDATION:@hltValidation,NANO:@NGTScoutingVal', - '--datatier':'GEN-SIM-DIGI-RAW,NANOAODSIM', + '--datatier':'NANOAODSIM', '--procModifiers': 'ngtScouting', - '--eventcontent':'FEVTDEBUGHLT,NANOAODSIM' + '--eventcontent':'NANOAODSIM' } class UpgradeWorkflow_HLTwDIGI75e33(UpgradeWorkflow):