From 325d81ad87591a916faad5b7518c425f07be8828 Mon Sep 17 00:00:00 2001 From: jean-roch Date: Fri, 15 Mar 2024 15:43:06 +0100 Subject: [PATCH] MUPOG includes PHYS by default. i.e. is never separated --- Configuration/PyReleaseValidation/python/relval_nano.py | 8 +++----- PhysicsTools/NanoAOD/python/autoNANO.py | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_nano.py b/Configuration/PyReleaseValidation/python/relval_nano.py index 32aaee41534cf..a87890f3c32a8 100644 --- a/Configuration/PyReleaseValidation/python/relval_nano.py +++ b/Configuration/PyReleaseValidation/python/relval_nano.py @@ -167,8 +167,7 @@ def subnext(self): '--datatier':'NANOAOD', '--eventcontent':'NANOAOD'}]) -steps['muPOGNANO_data13.0']=merge([{'-s' : 'NANO:@PHYS+@MUPOG', - '-n' : '1000'}, +steps['muPOGNANO_data13.0']=merge([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM', '-n' : '1000'}, steps['NANO_data13.0']]) steps['EGMNano_data13.0'] = merge([{'-s':'NANO:@EGM,DQM:@nanoAODDQM', '-n' : '1000'}, @@ -190,14 +189,13 @@ def subnext(self): '--conditions':'auto:phase1_2022_realistic'}, _NANO_mc]) -steps['muPOGNANO_mc13.2']=merge([{'-s' : 'NANO:@PHYS+@MUPOG ', '-n' : '1000'}, +steps['muPOGNANO_mc13.2']=merge([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM', '-n' : '1000'}, steps['NANO_mc13.2']]) steps['EGMNano_mc13.2'] = merge([{'-s':'NANO:@EGM,DQM:@nanoAODDQM', '-n' : '1000'}, steps['NANO_mc13.2']]) -steps['lepTimeLifeNANO_mc13.2']=merge([{'-s' : 'NANO:@LepTimeLife,DQM:@nanoAODDQM', - '-n' : '1000'}, +steps['lepTimeLifeNANO_mc13.2']=merge([{'-s' : 'NANO:@LepTimeLife,DQM:@nanoAODDQM', '-n' : '1000'}, steps['NANO_mc13.2']]) ##13.X INPUT diff --git a/PhysicsTools/NanoAOD/python/autoNANO.py b/PhysicsTools/NanoAOD/python/autoNANO.py index 33dd0558a1991..c47b4cfa3def7 100644 --- a/PhysicsTools/NanoAOD/python/autoNANO.py +++ b/PhysicsTools/NanoAOD/python/autoNANO.py @@ -29,7 +29,8 @@ def expandNanoMapping(seqList, mapping, key): 'L1' : {'customize': 'nanoL1TrigObjCustomize'}, 'L1FULL' : {'customize': 'nanoL1TrigObjCustomizeFull'}, # Muon POG flavours : add tables through customize, supposed to be combined with PHYS - 'MUPOG' : {'customize' : 'PhysicsTools/NanoAOD/custom_muon_cff.PrepMuonCustomNanoAOD'}, + 'MUPOG' : {'sequence': '@PHYS', + 'customize' : '@PHYS+PhysicsTools/NanoAOD/custom_muon_cff.PrepMuonCustomNanoAOD'}, # MUDPG flavours: use their own sequence 'MUDPG' : {'sequence': 'DPGAnalysis/MuonTools/muNtupleProducer_cff.muDPGNanoProducer', 'customize': 'DPGAnalysis/MuonTools/muNtupleProducer_cff.muDPGNanoCustomize'},