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

Alca outputs normalization #10192

Merged
merged 2 commits into from
Jul 14, 2015
Merged

Alca outputs normalization #10192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3e71f2
Merged refs/pull/10186/head from repository cms-sw
davidlange6 Jul 14, 2015
0f07acd
copy output definitions to follow the convention that each alca has a…
davidlange6 Jul 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_Output_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,11 @@
OutALCARECOEcalCalElectron.outputCommands.insert(0, "drop *")
OutALCARECOEcalCalElectron.outputCommands+=OutALCARECOEcalCalElectron_specific

OutALCARECOEcalCalWElectron=copy.deepcopy(OutALCARECOEcalCalElectron)
OutALCARECOEcalCalWElectron_noDrop=copy.deepcopy(OutALCARECOEcalCalElectron_noDrop)
OutALCARECOEcalCalZElectron=copy.deepcopy(OutALCARECOEcalCalElectron)
OutALCARECOEcalCalZElectron_noDrop=copy.deepcopy(OutALCARECOEcalCalElectron_noDrop)




5 changes: 5 additions & 0 deletions Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalUncalIsolElectron_Output_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@
SelectEvents = cms.vstring('pathALCARECOEcalUncalZElectron', 'pathALCARECOEcalUncalZSCElectron', 'pathALCARECOEcalUncalWElectron')
)


OutALCARECOEcalUncalWElectron=copy.deepcopy(OutALCARECOEcalUncalElectron)
OutALCARECOEcalUncalWElectron_noDrop=copy.deepcopy(OutALCARECOEcalUncalElectron_noDrop)
OutALCARECOEcalUncalZElectron=copy.deepcopy(OutALCARECOEcalUncalElectron)
OutALCARECOEcalUncalZElectron_noDrop=copy.deepcopy(OutALCARECOEcalUncalElectron_noDrop)
17 changes: 15 additions & 2 deletions Configuration/Applications/python/ConfigBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,12 @@ def addOutput(self):
theEventContent = cms.PSet(outputCommands = cms.untracked.vstring('keep *'))
else:
theEventContent = getattr(self.process, theStreamType+"EventContent")



addAlCaSelects=False
if theStreamType=='ALCARECO' and not theFilterName:
theFilterName='StreamALCACombined'
addAlCaSelects=True

CppType='PoolOutputModule'
if self._options.timeoutOutput:
Expand All @@ -539,6 +542,13 @@ def addOutput(self):
output.SelectEvents = cms.untracked.PSet(SelectEvents = cms.vstring('filtering_step'))
if theSelectEvent:
output.SelectEvents =cms.untracked.PSet(SelectEvents = cms.vstring(theSelectEvent))

if addAlCaSelects:
if not hasattr(output,'SelectEvents'):
output.SelectEvents=cms.untracked.PSet(SelectEvents=cms.vstring())
for alca in self.AlCaPaths:
output.SelectEvents.SelectEvents.extend(getattr(self.process,'OutALCARECO'+alca).SelectEvents.SelectEvents)


if hasattr(self.process,theModuleLabel):
raise Exception("the current process already has a module "+theModuleLabel+" defined")
Expand Down Expand Up @@ -1246,6 +1256,7 @@ def prepare_ALCAOUTPUT(self, sequence = None):

def prepare_ALCA(self, sequence = None, workflow = 'full'):
""" Enrich the process with alca streams """
print 'DL enriching',workflow,sequence
alcaConfig=self.loadDefaultOrSpecifiedCFF(sequence,self.ALCADefaultCFF)
sequence = sequence.split('.')[-1]

Expand All @@ -1255,12 +1266,14 @@ def prepare_ALCA(self, sequence = None, workflow = 'full'):
from Configuration.AlCa.autoAlca import autoAlca
# support @X from autoAlca.py, and recursion support: i.e T0:@Mu+@EG+...
self.expandMapping(alcaList,autoAlca)

self.AlCaPaths=[]
for name in alcaConfig.__dict__:
alcastream = getattr(alcaConfig,name)
shortName = name.replace('ALCARECOStream','')
if shortName in alcaList and isinstance(alcastream,cms.FilteredStream):
output = self.addExtraStream(name,alcastream, workflow = workflow)
self.executeAndRemember('process.ALCARECOEventContent.outputCommands.extend(process.OutALCARECO'+shortName+'_noDrop.outputCommands)')
self.AlCaPaths.append(shortName)
if 'DQM' in alcaList:
if not self._options.inlineEventContent and hasattr(self.process,name):
self.executeAndRemember('process.' + name + '.outputCommands.append("keep *_MEtoEDMConverter_*_*")')
Expand Down
43 changes: 0 additions & 43 deletions Configuration/EventContent/python/AlCaRecoOutput_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,49 +124,6 @@
eventAutoFlushCompressedSize=cms.untracked.int32(5*1024*1024)
)

ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlZMuMu_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlCosmicsInCollisions_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlCosmics_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlCosmicsHLT_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlCosmics0T_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlCosmics0THLT_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlLAS_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlMuonIsolated_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlMuonIsolatedPA_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlJpsiMuMu_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlUpsilonMuMu_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalIterativePhiSym_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlMinBias_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlBeamHalo_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripCalZeroBias_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripCalMinBias_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalElectron_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalUncalElectron_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalPi0Calib_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalEtaCalib_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalDijets_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalGammaJet_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalIsoTrk_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalIsoTrkNoHLT_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalMinBias_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalHO_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalHOCosmics_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalNoise_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlStandAloneCosmics_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlGlobalCosmicsInCollisions_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlGlobalCosmics_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlCalIsolatedMu_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlZMuMu_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlOverlaps_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlBeamHaloOverlaps_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOMuAlBeamHalo_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECORpcCalHLT_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECODtCalib_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripPCLHistos_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOLumiPixels_noDrop.outputCommands)
#ALCARECOEventContent.outputCommands.extend(OutALCARECOHotline.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlMinBiasHI_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalMinBiasHI_noDrop.outputCommands)


ALCARECOEventContent.outputCommands.append('drop *_MEtoEDMConverter_*_*')