From fbbfa1e5c943e7072e97eb2a25b68c3072f1fca6 Mon Sep 17 00:00:00 2001 From: Sven Dildick Date: Fri, 27 May 2016 05:31:30 +0200 Subject: [PATCH] clean-up --- .../HLTanalyzers/interface/HLTAnalyzer.h | 2 ++ .../HLTanalyzers/python/HLTAnalyser_cfi.py | 4 ++++ HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc | 24 ++++++++++--------- HLTrigger/HLTanalyzers/src/HLTMuon.cc | 9 +++---- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/HLTrigger/HLTanalyzers/interface/HLTAnalyzer.h b/HLTrigger/HLTanalyzers/interface/HLTAnalyzer.h index 1b7abfd473912..cf40eec0266bd 100644 --- a/HLTrigger/HLTanalyzers/interface/HLTAnalyzer.h +++ b/HLTrigger/HLTanalyzers/interface/HLTAnalyzer.h @@ -319,6 +319,8 @@ class HLTAnalyzer : public edm::EDAnalyzer { edm::InputTag ActivityR9_; edm::InputTag ActivityR9ID_; edm::InputTag ActivityHoverEH_; + edm::InputTag EcalRecHitEB_; + edm::InputTag EcalRecHitEE_; // AlCa OpenHLT input collections /* diff --git a/HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py b/HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py index 6a1f30a87113f..753654afb0c49 100644 --- a/HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py +++ b/HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py @@ -88,6 +88,8 @@ ActivityR9 = cms.InputTag("hltUnseededR9shape"), # spike cleaning ActivityR9ID = cms.InputTag("hltActivityR9ID"), ActivityHcalForHoverE = cms.InputTag("hltActivityPhotonHcalForHE"), + EcalRecHitEB = cms.InputTag("hltEcalRegionalEgammaRecHit","EcalRecHitsEB"), + EcalRecHitEE = cms.InputTag("hltEcalRegionalEgammaRecHit","EcalRecHitsEE"), ### egamma - standard or startup windows IsoElectrons = cms.InputTag("hltPixelMatchElectronsL1Seeded"), @@ -182,6 +184,8 @@ PrimaryVertices = cms.InputTag("hltPixelVertices"), PrimaryVerticesHLT = cms.InputTag('pixelVertices'), + BSProducer = cms.InputTag("hltOnlineBeamSpot"), + ### Run parameters RunParameters = cms.PSet( HistogramFile = cms.untracked.string('openhlt.root'), diff --git a/HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc b/HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc index 6b4f64ba1ca2d..5d14cce53ea9f 100644 --- a/HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc +++ b/HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc @@ -33,6 +33,7 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) : // variables. Example as follows: std::cout << " Beginning HLTAnalyzer Analysis " << std::endl; + BSProducer_ = conf.getParameter ("BSProducer"); hltjets_ = conf.getParameter ("hltjets"); hltcorjets_ = conf.getParameter ("hltcorjets"); hltcorL1L2L3jets_ = conf.getParameter ("hltcorL1L2L3jets"); @@ -162,14 +163,16 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) : HFECALClusters_ = conf.getParameter ("HFECALClusters"); HFElectrons_ = conf.getParameter ("HFElectrons"); - // Add ECAL Activity - ECALActivity_ = conf.getParameter ("ECALActivity"); - ActivityEcalIso_ = conf.getParameter ("ActivityEcalIso"); - ActivityHcalIso_ = conf.getParameter ("ActivityHcalIso"); - ActivityTrackIso_ = conf.getParameter ("ActivityTrackIso"); - ActivityR9_ = conf.getParameter ("ActivityR9"); // spike cleaning - ActivityR9ID_ = conf.getParameter ("ActivityR9ID"); - ActivityHoverEH_ = conf.getParameter ("ActivityHcalForHoverE"); + // Add ECAL Activity + ECALActivity_ = conf.getParameter ("ECALActivity"); + ActivityEcalIso_ = conf.getParameter ("ActivityEcalIso"); + ActivityHcalIso_ = conf.getParameter ("ActivityHcalIso"); + ActivityTrackIso_ = conf.getParameter ("ActivityTrackIso"); + ActivityR9_ = conf.getParameter ("ActivityR9"); // spike cleaning + ActivityR9ID_ = conf.getParameter ("ActivityR9ID"); + ActivityHoverEH_ = conf.getParameter ("ActivityHcalForHoverE"); + EcalRecHitEB_ = conf.getParameter ("EcalRecHitEB"); + EcalRecHitEE_ = conf.getParameter ("EcalRecHitEE"); // AlCa OpenHLT input collections @@ -207,7 +210,6 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) : // Define all consumed products - BSProducer_ = edm::InputTag("hltOnlineBeamSpot"); BSProducerToken_ = consumes(BSProducer_); hltjetsToken_ = consumes(hltjets_); hltcorjetsToken_ = consumes(hltcorjets_); @@ -302,8 +304,8 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) : ActivityR9Token_ = consumes(ActivityR9_); ActivityR9IDToken_ = consumes(ActivityR9ID_); ActivityHoverEHToken_ = consumes(ActivityHoverEH_); - EcalRecHitEBToken_ = consumes(edm::InputTag("hltEcalRegionalEgammaRecHit:EcalRecHitsEB")); - EcalRecHitEEToken_ = consumes(edm::InputTag("hltEcalRegionalEgammaRecHit:EcalRecHitsEE")); + EcalRecHitEBToken_ = consumes(EcalRecHitEB_); + EcalRecHitEEToken_ = consumes(EcalRecHitEE_); CandIsoToken_ = consumes(CandIso_); CandNonIsoToken_ = consumes(CandNonIso_); diff --git a/HLTrigger/HLTanalyzers/src/HLTMuon.cc b/HLTrigger/HLTanalyzers/src/HLTMuon.cc index 4c2107c901381..401659b6db408 100644 --- a/HLTrigger/HLTanalyzers/src/HLTMuon.cc +++ b/HLTrigger/HLTanalyzers/src/HLTMuon.cc @@ -347,10 +347,11 @@ void HLTMuon::analyze(const edm::Handle & else {nmuon = 0;} l1extra::L1MuonParticleCollection myMucands1; - myMucands1 = * MuCands1; - // reco::RecoChargedCandidateCollection myMucands1; - std::sort(myMucands1.begin(),myMucands1.end(),PtGreater()); - + if (MuCands1.isValid()) { + myMucands1 = * MuCands1; + // reco::RecoChargedCandidateCollection myMucands1; + std::sort(myMucands1.begin(),myMucands1.end(),PtGreater()); + } /////////////////////////////// Open-HLT muons /////////////////////////////// // Dealing with L2 muons