diff --git a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_Output_cff.py b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_Output_cff.py index fb4f66a4e0162..cf0f7342f19cd 100644 --- a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_Output_cff.py +++ b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_Output_cff.py @@ -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) + + + diff --git a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalUncalIsolElectron_Output_cff.py b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalUncalIsolElectron_Output_cff.py index 6fb60cd9cef6a..77a841ab7763b 100644 --- a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalUncalIsolElectron_Output_cff.py +++ b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalUncalIsolElectron_Output_cff.py @@ -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) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 1b1bdfff63ded..954e97415ccdf 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -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: @@ -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") @@ -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] @@ -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_*_*")') diff --git a/Configuration/EventContent/python/AlCaRecoOutput_cff.py b/Configuration/EventContent/python/AlCaRecoOutput_cff.py index 959d4ceb5b09b..3e2afe08cf0f7 100644 --- a/Configuration/EventContent/python/AlCaRecoOutput_cff.py +++ b/Configuration/EventContent/python/AlCaRecoOutput_cff.py @@ -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_*_*')