From 9c473f04925d053a0207933bca93e9a72b6c53ab Mon Sep 17 00:00:00 2001 From: Silvio Date: Fri, 31 Jul 2015 16:58:58 +0200 Subject: [PATCH] use hltConfig in dqmBeginRun and switch from getByLabel to getByToken --- .../Trigger/interface/BTVHLTOfflineSource.h | 17 +++--- DQMOffline/Trigger/src/BTVHLTOfflineSource.cc | 61 +++++++++++-------- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h b/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h index c48f12b1fdb47..328a5a07054fc 100644 --- a/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h +++ b/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h @@ -52,7 +52,8 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { private: virtual void analyze(const edm::Event&, const edm::EventSetup&); virtual void bookHistograms(DQMStore::IBooker &, edm::Run const & run, edm::EventSetup const & c) override; - + virtual void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override; + //helper functions //virtual bool validPathHLT(std::string path); //virtual bool isHLTPathAccepted(std::string pathName); @@ -71,13 +72,15 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { // edm::InputTag triggerSummaryLabel_; edm::InputTag triggerResultsLabel_; - edm::InputTag offlineCSVLabelPF_; - edm::InputTag offlineCSVLabelCalo_; - edm::InputTag hltFastPVLabel_; - edm::InputTag hltPFPVLabel_; - edm::InputTag hltCaloPVLabel_; - edm::InputTag offlinePVLabel_; + edm::EDGetTokenT offlineCSVTokenPF_; + edm::EDGetTokenT offlineCSVTokenCalo_; + + edm::EDGetTokenT > hltFastPVToken_; + edm::EDGetTokenT > hltPFPVToken_; + edm::EDGetTokenT > hltCaloPVToken_; + edm::EDGetTokenT > offlinePVToken_; + edm::EDGetTokenT triggerResultsToken; edm::EDGetTokenT triggerResultsFUToken; edm::EDGetTokenT triggerSummaryToken; diff --git a/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc b/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc index 4196a97b76021..17187face9afe 100644 --- a/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc +++ b/DQMOffline/Trigger/src/BTVHLTOfflineSource.cc @@ -55,12 +55,13 @@ BTVHLTOfflineSource::BTVHLTOfflineSource(const edm::ParameterSet& iConfig) triggerResultsFUToken = consumes (edm::InputTag(triggerResultsLabel_.label(),triggerResultsLabel_.instance(),std::string("FU"))); csvCaloTagsToken_ = consumes (edm::InputTag("hltCombinedSecondaryVertexBJetTagsCalo")); csvPfTagsToken_ = consumes (edm::InputTag("hltCombinedSecondaryVertexBJetTagsPF")); - offlineCSVLabelPF_ = iConfig.getParameter("offlineCSVLabelPF"); - offlineCSVLabelCalo_ = iConfig.getParameter("offlineCSVLabelCalo"); - hltFastPVLabel_ = iConfig.getParameter("hltFastPVLabel"); - hltPFPVLabel_ = iConfig.getParameter("hltPFPVLabel"); - hltCaloPVLabel_ = iConfig.getParameter("hltCaloPVLabel"); - offlinePVLabel_ = iConfig.getParameter("offlinePVLabel"); + offlineCSVTokenPF_ = consumes (iConfig.getParameter("offlineCSVLabelPF")); + offlineCSVTokenCalo_ = consumes (iConfig.getParameter("offlineCSVLabelCalo")); +// hltFastPVLabel_ = iConfig.getParameter("hltFastPVLabel"); + hltFastPVToken_ = consumes > (iConfig.getParameter("hltFastPVLabel")); + hltPFPVToken_ = consumes > (iConfig.getParameter("hltPFPVLabel")); + hltCaloPVToken_ = consumes > (iConfig.getParameter("hltCaloPVLabel")); + offlinePVToken_ = consumes > (iConfig.getParameter("offlinePVLabel")); // std::vector paths = iConfig.getParameter >("pathPairs"); @@ -80,6 +81,15 @@ BTVHLTOfflineSource::~BTVHLTOfflineSource() // (e.g. close files, deallocate resources etc.) } +//------------------------------------------------------------------------// +void BTVHLTOfflineSource::dqmBeginRun(const edm::Run& run, const edm::EventSetup& c) +{ + bool changed(true); + if (!hltConfig_.init(run, c, processname_, changed)) { + LogDebug("BTVHLTOfflineSource") << "HLTConfigProvider failed to initialize."; +} + +} //------------------------------------------------------------------------// void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) @@ -124,13 +134,13 @@ BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iS //------------ Offline Objects ------ Handle offlineJetTagHandlerPF; - iEvent.getByLabel(offlineCSVLabelPF_, offlineJetTagHandlerPF); + iEvent.getByToken(offlineCSVTokenPF_, offlineJetTagHandlerPF); Handle offlineJetTagHandlerCalo; - iEvent.getByLabel(offlineCSVLabelCalo_, offlineJetTagHandlerCalo); + iEvent.getByToken(offlineCSVTokenCalo_, offlineJetTagHandlerCalo); Handle offlineVertexHandler; - iEvent.getByLabel(offlinePVLabel_, offlineVertexHandler); + iEvent.getByToken(offlinePVToken_, offlineVertexHandler); //---------- Event counting (DEBUG) ---------- @@ -175,7 +185,7 @@ BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } } - iEvent.getByLabel(hltPFPVLabel_, VertexHandler); + iEvent.getByToken(hltPFPVToken_, VertexHandler); if (VertexHandler.isValid()) { v->getMEhisto_PVz()->Fill(VertexHandler->begin()->z()); @@ -213,14 +223,14 @@ BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } } - iEvent.getByLabel(hltFastPVLabel_, VertexHandler); + iEvent.getByToken(hltFastPVToken_, VertexHandler); if (VertexHandler.isValid()) { v->getMEhisto_PVz()->Fill(VertexHandler->begin()->z()); if (offlineVertexHandler.isValid()) v->getMEhisto_fastPVz_HLTMinusRECO()->Fill(VertexHandler->begin()->z()-offlineVertexHandler->begin()->z()); } - iEvent.getByLabel(hltCaloPVLabel_, VertexHandler); + iEvent.getByToken(hltCaloPVToken_, VertexHandler); if (VertexHandler.isValid()) { v->getMEhisto_fastPVz()->Fill(VertexHandler->begin()->z()); @@ -245,11 +255,12 @@ BTVHLTOfflineSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const iBooker.setCurrentFolder(dirname_); //-------------- htlConfig_ ---------------------- - - bool changed(true); - if (!hltConfig_.init(run, c, processname_, changed)) { - LogDebug("BTVHLTOfflineSource") << "HLTConfigProvider failed to initialize."; - } + +// REMOVE ME ! +// bool changed(true); +// if (!hltConfig_.init(run, c, processname_, changed)) { +// LogDebug("BTVHLTOfflineSource") << "HLTConfigProvider failed to initialize."; +// } //----------- Define hltPathsAll_ ----------------- @@ -295,42 +306,42 @@ BTVHLTOfflineSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const histoname = labelname+"_CSV"; title = labelname+"_CSV "+trigPath; MonitorElement * CSV = iBooker.book1D(histoname.c_str(),title.c_str(),110,-0.1,1); - CSV->getTH1(); +// CSV->getTH1(); histoname = labelname+"_Pt"; title = labelname+"_Pt "+trigPath; MonitorElement * Pt = iBooker.book1D(histoname.c_str(),title.c_str(),100,0,400); - Pt->getTH1(); +// Pt->getTH1(); histoname = labelname+"_Eta"; title = labelname+"_Eta "+trigPath; MonitorElement * Eta = iBooker.book1D(histoname.c_str(),title.c_str(),60,-3.0,3.0); - Eta->getTH1(); +// Eta->getTH1(); histoname = "RECOvsHLT_CSV"; title = "offline CSV vs online CSV "+trigPath; MonitorElement * CSV_RECOvsHLT = iBooker.book2D(histoname.c_str(),title.c_str(),110,-0.1,1,110,-0.1,1); - CSV_RECOvsHLT->getTH2F(); +// CSV_RECOvsHLT->getTH2F(); histoname = labelname+"_PVz"; title = "online z(PV) "+trigPath; MonitorElement * PVz = iBooker.book1D(histoname.c_str(),title.c_str(),80,-20,20); - PVz->getTH1(); +// PVz->getTH1(); histoname = labelname+"_fastPVz"; title = "online z(fastPV) "+trigPath; MonitorElement * fastPVz = iBooker.book1D(histoname.c_str(),title.c_str(),80,-20,20); - fastPVz->getTH1(); +// fastPVz->getTH1(); histoname = "HLTMinusRECO_PVz"; title = "online z(PV) - offline z(PV) "+trigPath; MonitorElement * PVz_HLTMinusRECO = iBooker.book1D(histoname.c_str(),title.c_str(),200,-0.5,0.5); - PVz_HLTMinusRECO->getTH1(); +// PVz_HLTMinusRECO->getTH1(); histoname = "HLTMinusRECO_fastPVz"; title = "online z(fastPV) - offline z(PV) "+trigPath; MonitorElement * fastPVz_HLTMinusRECO = iBooker.book1D(histoname.c_str(),title.c_str(),100,-2,2); - fastPVz_HLTMinusRECO->getTH1(); +// fastPVz_HLTMinusRECO->getTH1(); v->setHistos(CSV,Pt,Eta,CSV_RECOvsHLT,PVz,fastPVz,PVz_HLTMinusRECO,fastPVz_HLTMinusRECO); }