diff --git a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalPhiSym_Output_cff.py b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalPhiSym_Output_cff.py deleted file mode 100644 index 98a7f980582ab..0000000000000 --- a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalPhiSym_Output_cff.py +++ /dev/null @@ -1,21 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# output block for alcastream EcalPhiSym -# keep L1 info and laser-recalibrated hits : -# non-recalibrated hits have HLT as parent process - -OutALCARECOEcalCalPhiSym_noDrop = cms.PSet( - # put this if you have a filter - SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('pathALCARECOEcalCalPhiSym') - ), - outputCommands = cms.untracked.vstring( - 'keep *_ecalPhiSymCorrected_phiSymEcalRecHitsEB_*', - 'keep *_ecalPhiSymCorrected_phiSymEcalRecHitsEE_*', - 'keep L1GlobalTriggerReadoutRecord_hltGtDigis_*_*') -) - - -import copy -OutALCARECOEcalCalPhiSym=copy.deepcopy(OutALCARECOEcalCalPhiSym_noDrop) -OutALCARECOEcalCalPhiSym.outputCommands.insert(0,"drop *") diff --git a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalPhiSym_cff.py b/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalPhiSym_cff.py deleted file mode 100644 index a4671bcb0245c..0000000000000 --- a/Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalPhiSym_cff.py +++ /dev/null @@ -1,23 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -#------------------------------------------------ -#AlCaReco filtering for phi symmetry calibration: -#------------------------------------------------ -# create sequence for rechit filtering for phi symmetry calibration -from Calibration.EcalAlCaRecoProducers.alcastreamEcalPhiSym_cff import * -import RecoLocalCalo.EcalRecProducers.ecalRecalibRecHit_cfi - -#apply laser corrections - -ecalPhiSymCorrected = RecoLocalCalo.EcalRecProducers.ecalRecalibRecHit_cfi.ecalRecHit.clone( - doEnergyScale = cms.bool(False), - doIntercalib = cms.bool(False), - EERecHitCollection = cms.InputTag("hltAlCaPhiSymStream","phiSymEcalRecHitsEE"), - EBRecHitCollection = cms.InputTag("hltAlCaPhiSymStream","phiSymEcalRecHitsEB"), - doLaserCorrections = cms.bool(True), - EBRecalibRecHitCollection = cms.string('phiSymEcalRecHitsEB'), - EERecalibRecHitCollection = cms.string('phiSymEcalRecHitsEE') -) - -seqALCARECOEcalCalPhiSym = cms.Sequence(ecalphiSymHLT*ecalPhiSymCorrected) - diff --git a/Configuration/EventContent/python/AlCaRecoOutput_cff.py b/Configuration/EventContent/python/AlCaRecoOutput_cff.py index 4d264f8b5e396..0f793be659d48 100644 --- a/Configuration/EventContent/python/AlCaRecoOutput_cff.py +++ b/Configuration/EventContent/python/AlCaRecoOutput_cff.py @@ -36,8 +36,6 @@ ############################################################### # ECAL Calibration ############################################################### -# ECAL calibration with phi symmetry -from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalPhiSym_Output_cff import * # ECAL calibration with isol. electrons from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalIsolElectron_Output_cff import * # The following paths are obsoleted since pi0 calibration diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 3ae8245382028..a42dab589503a 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -675,7 +675,6 @@ ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlBeamHalo_noDrop.outputCommands) ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripCalZeroBias_noDrop.outputCommands) ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripCalMinBias_noDrop.outputCommands) -ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalPhiSym_noDrop.outputCommands) ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalElectron_noDrop.outputCommands) ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalPi0Calib_noDrop.outputCommands) ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalEtaCalib_noDrop.outputCommands) diff --git a/Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py b/Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py index b6fc03474c20f..5ba94426fcb93 100644 --- a/Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py +++ b/Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py @@ -46,27 +46,6 @@ dataTier = cms.untracked.string('ALCARECO') ) - -# ECAL calibration with phi symmetry -from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalPhiSym_cff import * - -from DQMOffline.Configuration.AlCaRecoDQMHI_cff import * - -#pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym*ALCARECOEcalCalPhisymDQM) -pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym) - -from Configuration.EventContent.AlCaRecoOutput_cff import * - -ALCARECOStreamEcalCalPhiSym = cms.FilteredStream( - responsible = 'Stefano Argiro', - name = 'ALCARECOEcalCalPhiSym', - paths = (pathALCARECOEcalCalPhiSym), - content = OutALCARECOEcalCalPhiSym.outputCommands, - selectEvents = OutALCARECOEcalCalPhiSym.SelectEvents, - dataTier = cms.untracked.string('ALCARECO') - ) - - # HCAL calibration with min.bias from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBiasHI_cff import * diff --git a/Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py b/Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py index 1947a7729b0b7..6fe4e75bf4180 100644 --- a/Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py +++ b/Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py @@ -42,28 +42,6 @@ dataTier = cms.untracked.string('ALCARECO') ) - -# ECAL calibration with phi symmetry -from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalPhiSym_cff import * - -from DQMOffline.Configuration.AlCaRecoDQM_cff import * - -#pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym*ALCARECOEcalCalPhisymDQM) -pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym) - -from Configuration.EventContent.AlCaRecoOutput_cff import * - -ALCARECOStreamEcalCalPhiSym = cms.FilteredStream( - responsible = 'Stefano Argiro', - name = 'ALCARECOEcalCalPhiSym', - paths = (pathALCARECOEcalCalPhiSym), - content = OutALCARECOEcalCalPhiSym.outputCommands, - selectEvents = OutALCARECOEcalCalPhiSym.SelectEvents, - dataTier = cms.untracked.string('ALCARECO') - ) - - - # HCAL calibration with min.bias from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBias_cff import *