Skip to content

Commit

Permalink
add support for "hltProcess" option in SKIM step
Browse files Browse the repository at this point in the history
  • Loading branch information
@missirol
missirol committed Jan 13, 2023
1 parent f176694 commit 7c50f85
Showing 1 changed file with 33 additions and 26 deletions.
59 changes: 33 additions & 26 deletions Configuration/Applications/python/ConfigBuilder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ def addCustomise(self,unsch=0):
if opt.count('.')>1:
raise Exception("more than . in the specification:"+opt)
fileName=opt.split('.')[0]
if opt.count('.')==0: rest='customise'
if opt.count('.')==0: rest='customise'
else:
rest=opt.split('.')[1]
if rest=='py': rest='customise' #catch the case of --customise file.py
Expand Down Expand Up @@ -1750,15 +1750,21 @@ def prepare_SKIM(self, stepSpec = "all"):
## support @Mu+DiJet+@Electron configuration via autoSkim.py
from Configuration.Skimming.autoSkim import autoSkim
self.expandMapping(skimlist,autoSkim)

#print "dictionnary for skims:",skimConfig.__dict__
#print("dictionary for skims:", skimConfig.__dict__)
for skim in skimConfig.__dict__:
skimstream = getattr(skimConfig,skim)
if isinstance(skimstream,cms.Path):
#black list the alca path so that they do not appear in the cfg
skimstream = getattr(skimConfig, skim)

# blacklist AlCa paths so that they do not appear in the cfg
if isinstance(skimstream, cms.Path):
self.blacklist_paths.append(skimstream)
if (not isinstance(skimstream,cms.FilteredStream)):
# if enabled, apply "hltProcess" renaming to Sequences
elif isinstance(skimstream, cms.Sequence):
if self._options.hltProcess or ('HLT' in self.stepMap):
self.renameHLTprocessInSequence(skim)

if not isinstance(skimstream, cms.FilteredStream):
continue

shortname = skim.replace('SKIMStream','')
if (sequence=="all"):
self.addExtraStream(skim,skimstream)
Expand All @@ -1779,12 +1785,11 @@ def prepare_SKIM(self, stepSpec = "all"):
for i in range(skimlist.count(shortname)):
skimlist.remove(shortname)



if (skimlist.__len__()!=0 and sequence!="all"):
print('WARNING, possible typo with SKIM:'+'+'.join(skimlist))
raise Exception('WARNING, possible typo with SKIM:'+'+'.join(skimlist))


def prepare_USER(self, stepSpec = None):
''' Enrich the schedule with a user defined sequence '''
_,_userSeq,_ = self.loadDefaultOrSpecifiedCFF(stepSpec,self.USERDefaultCFF)
Expand Down Expand Up @@ -1877,25 +1882,25 @@ def __init__(self, paramSearch, paramReplace, verbose=False, whitelist=()):
self._verbose = verbose
self._whitelist = whitelist

def doIt(self,pset,base):
def doIt(self, pset, base):
if isinstance(pset, cms._Parameterizable):
for name in pset.parameters_().keys():
# skip whitelisted parameters
if name in self._whitelist:
continue
# if I use pset.parameters_().items() I get copies of the parameter values
# so I can't modify the nested pset
value = getattr(pset,name)
type = value.pythonTypeName()
if type in ('cms.PSet', 'cms.untracked.PSet'):
value = getattr(pset, name)
valueType = type(value)
if valueType in [cms.EDAlias, cms.EDAnalyzer, cms.EDFilter, cms.EDProducer, cms.PSet, cms.untracked.PSet]:
self.doIt(value,base+"."+name)
elif type in ('cms.VPSet', 'cms.untracked.VPSet'):
elif valueType in [cms.VPSet, cms.untracked.VPSet]:
for (i,ps) in enumerate(value): self.doIt(ps, "%s.%s[%d]"%(base,name,i) )
elif type in ('cms.string', 'cms.untracked.string'):
elif valueType in [cms.string, cms.untracked.string]:
if value.value() == self._paramSearch:
if self._verbose: print("set string process name %s.%s %s ==> %s"% (base, name, value, self._paramReplace))
setattr(pset, name,self._paramReplace)
elif type in ('cms.VInputTag', 'cms.untracked.VInputTag'):
elif valueType in [cms.VInputTag, cms.untracked.VInputTag]:
for (i,n) in enumerate(value):
if not isinstance(n, cms.InputTag):
n=cms.InputTag(n)
Expand All @@ -1904,11 +1909,11 @@ def doIt(self,pset,base):
if self._verbose:print("set process name %s.%s[%d] %s ==> %s " % (base, name, i, n, self._paramReplace))
setattr(n,"processName",self._paramReplace)
value[i]=n
elif type in ('cms.vstring', 'cms.untracked.vstring'):
elif valueType in [cms.vstring, cms.untracked.vstring]:
for (i,n) in enumerate(value):
if n==self._paramSearch:
getattr(pset,name)[i]=self._paramReplace
elif type in ('cms.InputTag', 'cms.untracked.InputTag'):
elif valueType in [cms.InputTag, cms.untracked.InputTag]:
if value.processName == self._paramSearch:
if self._verbose: print("set process name %s.%s %s ==> %s " % (base, name, value, self._paramReplace))
setattr(getattr(pset, name),"processName",self._paramReplace)
Expand Down Expand Up @@ -1938,13 +1943,11 @@ def renameInputTagsInSequence(self,sequence,oldT="rawDataCollector",newT="rawDat

#change the process name used to address HLT results in any sequence
def renameHLTprocessInSequence(self,sequence,proc=None,HLTprocess='HLT'):
if self._options.hltProcess:
proc=self._options.hltProcess
else:
proc=self.process.name_()
if proc==HLTprocess: return
# look up all module in dqm sequence
print("replacing %s process name - sequence %s will use '%s'" % (HLTprocess,sequence, proc))
proc = self._options.hltProcess if self._options.hltProcess else self.process.name_()
if proc == HLTprocess:
return
# look up all module in sequence
print("replacing %s process name - sequence %s will use '%s'" % (HLTprocess, sequence, proc))
getattr(self.process,sequence).visit(ConfigBuilder.MassSearchReplaceProcessNameVisitor(HLTprocess,proc,whitelist = ("subSystemFolder",)))
if 'from Configuration.Applications.ConfigBuilder import ConfigBuilder' not in self.additionalCommands:
self.additionalCommands.append('from Configuration.Applications.ConfigBuilder import ConfigBuilder')
Expand Down Expand Up @@ -2004,7 +2007,7 @@ def prepare_DQM(self, stepSpec = 'DQMOffline'):

pathName='dqmofflineOnPAT_step'
for (i,_sequence) in enumerate(postSequenceList):
#Fix needed to avoid duplication of sequences not defined in autoDQM or without a PostDQM
#Fix needed to avoid duplication of sequences not defined in autoDQM or without a PostDQM
if (sequenceList[i]==postSequenceList[i]):
continue
if (i!=0):
Expand Down Expand Up @@ -2047,6 +2050,10 @@ def prepare_HARVESTING(self, stepSpec = None):
setattr(self.process,name+"_step",cms.Path(harvestingstream))
self.schedule.append(getattr(self.process,name+"_step"))

# # NOTE: the "hltProcess" option currently does nothing in the HARVEST step
# if self._options.hltProcess or ('HLT' in self.stepMap):
# pass

self.scheduleSequence('DQMSaver','dqmsave_step')
return

Expand Down

0 comments on commit 7c50f85

Please sign in to comment.