Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simplify MU-DPG custom nano configuration #43753

Merged
merged 1 commit into from
Jan 25, 2024
Merged

simplify MU-DPG custom nano configuration #43753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Configuration/Applications/python/ConfigBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,15 @@ def prepare_NANO(self, stepSpec = '' ):
# build and inject the sequence
if len(_nanoSeq) < 1 and '@' in stepSpec:
raise Exception(f'The specified mapping: {stepSpec} generates an empty NANO sequence. Please provide a valid mappign')
self.scheduleSequence('+'.join(_nanoSeq), 'nanoAOD_step')
_seqToSchedule = []
for _subSeq in _nanoSeq:
if '.' in _subSeq:
_cff,_seq = _subSeq.split('.')
self.loadAndRemember(_cff)
_seqToSchedule.append(_seq)
else:
_seqToSchedule.append(_subSeq)
self.scheduleSequence('+'.join(_seqToSchedule), 'nanoAOD_step')

# add the customisations
for custom in _nanoCustoms:
Expand Down
18 changes: 9 additions & 9 deletions PhysicsTools/NanoAOD/python/autoNANO.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ def expandNanoMapping(seqList, mapping, key):
# - An empty string recalls the default for the given key
# - None is interpreted as "ignore this"
seqList.remove(specifiedCommand)
if key in mappedTo and mappedTo[key] is not None:
if key in mappedTo and mappedTo[key] is not None:
seqList.extend(mappedTo[key].split('+'))
break;
if level==maxLevel:
raise Exception("Could not fully expand "+repr(seqList)+" from "+repr(mapping))


autoNANO = {
autoNANO = {
# PHYS is a mapping to the default NANO config, i.e. empty strings
'PHYS': {'sequence': '',
'PHYS': {'sequence': '',
'customize': ''},
# L1 flavours: add tables through customize, supposed to be combined with PHYS
'L1' : {'customize': 'nanoL1TrigObjCustomize'},
'L1FULL' : {'customize': 'nanoL1TrigObjCustomizeFull'},
# MUDPG flavours: use their own sequence
'MUDPG' : {'sequence': 'muDPGNanoProducer',
'customize': 'muDPGNanoCustomize'},
'MUDPGBKG' : {'sequence': 'muDPGNanoProducerBkg',
'customize': 'muDPGNanoBkgCustomize'},
# MUDPG flavours: use their own sequence
'MUDPG' : {'sequence': 'DPGAnalysis/MuonTools/muNtupleProducer_cff.muDPGNanoProducer',
'customize': 'DPGAnalysis/MuonTools/muNtupleProducer_cff.muDPGNanoCustomize'},
'MUDPGBKG' : {'sequence': 'DPGAnalysis/MuonTools/muNtupleProducerBkg_cff.muDPGNanoProducerBkg',
'customize': 'DPGAnalysis/MuonTools/muNtupleProducerBkg_cff.muDPGNanoBkgCustomize'},
# PromptReco config: PHYS+L1
'Prompt' : {'sequence': '@PHYS',
'Prompt' : {'sequence': '@PHYS',
'customize': '@PHYS+@L1'}
}
4 changes: 0 additions & 4 deletions PhysicsTools/NanoAOD/python/nano_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,3 @@ def nanoL1TrigObjCustomizeFull(process):
process.nanoTableTaskCommon.add(process.l1TablesTask)
return process

### muon DPG NANO flavour sequences and customize functions
from DPGAnalysis.MuonTools.muNtupleProducer_cff import *
from DPGAnalysis.MuonTools.muNtupleProducerBkg_cff import *