diff --git a/DQM/HLTEvF/interface/FourVectorHLT.h b/DQM/HLTEvF/interface/FourVectorHLT.h index 5ef7e760dbbed..2441dc6707fa6 100644 --- a/DQM/HLTEvF/interface/FourVectorHLT.h +++ b/DQM/HLTEvF/interface/FourVectorHLT.h @@ -84,6 +84,9 @@ class FourVectorHLT : public edm::EDAnalyzer { edm::InputTag triggerSummaryLabel_; edm::InputTag triggerResultLabel_; + //define Token(-s) + edm::EDGetTokenT triggerSummaryToken_; + // helper class to store the data class PathInfo { PathInfo(): diff --git a/DQM/HLTEvF/interface/FourVectorHLTOnline.h b/DQM/HLTEvF/interface/FourVectorHLTOnline.h index 719a95d6f1f77..aedfd2303a001 100644 --- a/DQM/HLTEvF/interface/FourVectorHLTOnline.h +++ b/DQM/HLTEvF/interface/FourVectorHLTOnline.h @@ -211,6 +211,21 @@ class FourVectorHLTOnline : public edm::EDAnalyzer { edm::Handle triggerResults_; + //define Token(-s) + edm::EDGetTokenT triggerResultsToken_; + edm::EDGetTokenT triggerSummaryToken_; + edm::EDGetTokenT muonRecoCollectionNameToken_; + edm::EDGetTokenT gsfElectronsToken_; + edm::EDGetTokenT caloRecoTauProducerToken_; + edm::EDGetTokenT iterativeCone5CaloJetsToken_; + edm::EDGetTokenT jetProbabilityBJetTagsToken_; + edm::EDGetTokenT softMuonBJetTagsToken_; + edm::EDGetTokenT metToken_; + edm::EDGetTokenT photonsToken_; + edm::EDGetTokenT pixelTracksToken_; + edm::EDGetTokenT triggerResultsTokenFU_; + edm::EDGetTokenT triggerSummaryLabelFUToken_; + class PathInfo { PathInfo(): diff --git a/DQM/HLTEvF/interface/HLTAlCaMonEcalPhiSym.h b/DQM/HLTEvF/interface/HLTAlCaMonEcalPhiSym.h index 37b99a51790ea..71962aebf7d29 100644 --- a/DQM/HLTEvF/interface/HLTAlCaMonEcalPhiSym.h +++ b/DQM/HLTEvF/interface/HLTAlCaMonEcalPhiSym.h @@ -13,7 +13,8 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/EDAnalyzer.h" - +#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" + class DQMStore; class MonitorElement; @@ -127,7 +128,10 @@ class HLTAlCaMonEcalPhiSym : public edm::EDAnalyzer { /// Output file name if required std::string fileName_; - + + //define Token(-s) + edm::EDGetTokenT productMonitoredEBToken_; + edm::EDGetTokenT productMonitoredEEToken_; }; #endif diff --git a/DQM/HLTEvF/interface/HLTAlCaMonPi0.h b/DQM/HLTEvF/interface/HLTAlCaMonPi0.h index 4cb066ae9ffed..3bd9282ce00fc 100755 --- a/DQM/HLTEvF/interface/HLTAlCaMonPi0.h +++ b/DQM/HLTEvF/interface/HLTAlCaMonPi0.h @@ -339,6 +339,12 @@ class HLTAlCaMonPi0 : public edm::EDAnalyzer { /// Output file name if required std::string fileName_; + + //define Token(-s) + edm::EDGetTokenT productMonitoredEBpi0Token_; + edm::EDGetTokenT productMonitoredEBetaToken_; + edm::EDGetTokenT productMonitoredEEpi0Token_; + edm::EDGetTokenT productMonitoredEEetaToken_; }; #endif diff --git a/DQM/HLTEvF/interface/HLTJetMETDQMSource.h b/DQM/HLTEvF/interface/HLTJetMETDQMSource.h index 5d8e7bd0996c6..f2329a48105af 100644 --- a/DQM/HLTEvF/interface/HLTJetMETDQMSource.h +++ b/DQM/HLTEvF/interface/HLTJetMETDQMSource.h @@ -109,6 +109,12 @@ class HLTJetMETDQMSource : public edm::EDAnalyzer { HLTConfigProvider hltConfig_; // data across paths MonitorElement* scalersSelect; + + //define Tokens(-s) + edm::EDGetTokenT triggerResultsToken_; + edm::EDGetTokenT triggerResultsTokenFU_; + edm::EDGetTokenT triggerSummaryToken_; + edm::EDGetTokenT triggerSummaryTokenFU_; // helper class to store the data path class PathInfo { diff --git a/DQM/HLTEvF/interface/HLTMonBitSummary.h b/DQM/HLTEvF/interface/HLTMonBitSummary.h index 4be375bbb2978..4513c598f86a4 100644 --- a/DQM/HLTEvF/interface/HLTMonBitSummary.h +++ b/DQM/HLTEvF/interface/HLTMonBitSummary.h @@ -92,5 +92,7 @@ class HLTMonBitSummary : public edm::EDAnalyzer { MonitorElement * pf_; MonitorElement * ratio_; + //define Token(-s) + edm::EDGetTokenT inputToken_; }; #endif diff --git a/DQM/HLTEvF/interface/HLTMonHcalIsoTrack.h b/DQM/HLTEvF/interface/HLTMonHcalIsoTrack.h index 78b5b19c296bf..d59ce7437a095 100644 --- a/DQM/HLTEvF/interface/HLTMonHcalIsoTrack.h +++ b/DQM/HLTEvF/interface/HLTMonHcalIsoTrack.h @@ -14,6 +14,8 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h" + #include class HLTMonHcalIsoTrack : public edm::EDAnalyzer { @@ -73,6 +75,10 @@ class HLTMonHcalIsoTrack : public edm::EDAnalyzer { std::vector hL1eta; std::vector hL1phi; + //define Token(-s) + edm::EDGetTokenT toLabToken_; + std::vector > l2collectionToken_; + std::vector > l3collectionToken_; }; diff --git a/DQM/HLTEvF/interface/HLTMonSimpleBTag.h b/DQM/HLTEvF/interface/HLTMonSimpleBTag.h index b7b29f3f5a95b..9feaa56012c37 100644 --- a/DQM/HLTEvF/interface/HLTMonSimpleBTag.h +++ b/DQM/HLTEvF/interface/HLTMonSimpleBTag.h @@ -92,6 +92,9 @@ class HLTMonSimpleBTag : public edm::EDAnalyzer { edm::InputTag triggerSummaryLabel_; edm::InputTag triggerResultLabel_; + //define Token(-s) + edm::EDGetTokenT triggerSummaryToken_; + // helper class to store the data class PathInfo { PathInfo(): diff --git a/DQM/HLTEvF/interface/HLTOniaSource.h b/DQM/HLTEvF/interface/HLTOniaSource.h index 3afd71f659a87..6514fdaa37640 100644 --- a/DQM/HLTEvF/interface/HLTOniaSource.h +++ b/DQM/HLTEvF/interface/HLTOniaSource.h @@ -16,7 +16,7 @@ #include "DQMServices/Core/interface/MonitorElement.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" #include "DataFormats/TrackReco/interface/Track.h" - +#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h" class PtGreaterRef { public: @@ -71,7 +71,12 @@ class HLTOniaSource : public edm::EDAnalyzer { std::map trackME_; std::map massME_; bool hltConfigInit_; - + + //define Token(-s) + edm::EDGetTokenT pixelToken_; + edm::EDGetTokenT trackToken_; + edm::EDGetTokenT beamSpotToken_; + edm::EDGetTokenT triggerSummaryRAWToken_; }; #endif diff --git a/DQM/HLTEvF/interface/TrigResRateMon.h b/DQM/HLTEvF/interface/TrigResRateMon.h index 4610ca09bf8a1..f7b8ceb4c96ba 100644 --- a/DQM/HLTEvF/interface/TrigResRateMon.h +++ b/DQM/HLTEvF/interface/TrigResRateMon.h @@ -55,6 +55,7 @@ #include "DataFormats/HLTReco/interface/TriggerTypeDefs.h" #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" +#include "DataFormats/Scalers/interface/LumiScalers.h" /* needs cleaining of include statments (VR) @@ -68,7 +69,8 @@ #include "DQMServices/Core/interface/MonitorElement.h" - +//for LumiScalers in getByToken method +#include "DataFormats/Scalers/interface/LumiScalers.h" #include #include @@ -323,6 +325,12 @@ class TrigResRateMon : public edm::EDAnalyzer { edm::Handle triggerResults_; + //define Token(-s) + edm::EDGetTokenT triggerResultsToken_; + edm::EDGetTokenT triggerResultsTokenFU_; + edm::EDGetTokenT lumiScalersToken_; + + // create a class that can store all the strings // associated with a primary dataset diff --git a/DQM/HLTEvF/plugins/FourVectorHLT.cc b/DQM/HLTEvF/plugins/FourVectorHLT.cc index f6b59f1667bb1..45d80e15503dc 100644 --- a/DQM/HLTEvF/plugins/FourVectorHLT.cc +++ b/DQM/HLTEvF/plugins/FourVectorHLT.cc @@ -63,6 +63,9 @@ FourVectorHLT::FourVectorHLT(const edm::ParameterSet& iConfig): } triggerSummaryLabel_ = iConfig.getParameter("triggerSummaryLabel"); + + //set Token(-s) + triggerSummaryToken_ = consumes(iConfig.getParameter("triggerSummaryLabel")); } @@ -89,7 +92,7 @@ FourVectorHLT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) LogDebug("Status")<< "analyze" ; edm::Handle triggerObj; - iEvent.getByLabel(triggerSummaryLabel_,triggerObj); + iEvent.getByToken(triggerSummaryToken_, triggerObj); if(!triggerObj.isValid()) { edm::LogInfo("Status") << "Summary HLT object (TriggerEvent) not found, " "skipping event"; diff --git a/DQM/HLTEvF/plugins/FourVectorHLTOnline.cc b/DQM/HLTEvF/plugins/FourVectorHLTOnline.cc index 20065572687eb..b29de6e4f3302 100644 --- a/DQM/HLTEvF/plugins/FourVectorHLTOnline.cc +++ b/DQM/HLTEvF/plugins/FourVectorHLTOnline.cc @@ -129,7 +129,24 @@ FourVectorHLTOnline::FourVectorHLTOnline(const edm::ParameterSet& iConfig): ME_HLTAll_LS_ = NULL; ME_HLT_BX_ = NULL; ME_HLT_CUSTOM_BX_ = NULL; - + + //set Token(-s) + triggerResultsToken_ = consumes(iConfig.getParameter("triggerResultsLabel")); + triggerSummaryToken_ = consumes(iConfig.getParameter("triggerSummaryLabel")); + muonRecoCollectionNameToken_ = consumes(iConfig.getUntrackedParameter("muonRecoCollectionName", std::string("muons"))); + gsfElectronsToken_ = consumes(std::string("gsfElectrons")); + caloRecoTauProducerToken_ = consumes(std::string("caloRecoTauProducer")); + iterativeCone5CaloJetsToken_ = consumes(std::string("iterativeCone5CaloJets")); + jetProbabilityBJetTagsToken_ = consumes(std::string("jetProbabilityBJetTags")); + softMuonBJetTagsToken_ = consumes(std::string("softMuonBJetTags")); + metToken_ = consumes(std::string("met")); + photonsToken_ = consumes(std::string("photons")); + pixelTracksToken_ = consumes(std::string("pixelTracks")); + edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU"); + triggerResultsTokenFU_ = consumes(triggerResultsLabelFU); + edm::InputTag triggerSummaryLabelFU(triggerSummaryLabel_.label(),triggerSummaryLabel_.instance(), "FU"); + triggerSummaryLabelFUToken_ = consumes(triggerSummaryLabelFU); + } @@ -158,41 +175,12 @@ FourVectorHLTOnline::analyze(const edm::Event& iEvent, const edm::EventSetup& iS ++nev_; LogDebug("FourVectorHLTOnline")<< " analyze...." ; - - - /* - Handle genParticles; - iEvent.getByLabel("genParticles", genParticles); - if(!genParticles.isValid()) { - edm::LogInfo("FourVectorHLTOnline") << "genParticles not found, " - "skipping event"; - return; - } - - Handle genJets; - iEvent.getByLabel("iterativeCone5GenJets",genJets); - if(!genJets.isValid()) { - edm::LogInfo("FourVectorHLTOnline") << "genJets not found, " - "skipping event"; - return; - } - - Handle genMets; - iEvent.getByLabel("genMetTrue",genMets); - if(!genMets.isValid()) { - edm::LogInfo("FourVectorHLTOnline") << "genMets not found, " - "skipping event"; - return; - } - */ - // Get trigger results edm::Handle triggerResults; - iEvent.getByLabel(triggerResultsLabel_,triggerResults); + iEvent.getByToken(triggerResultsToken_, triggerResults); if(!triggerResults.isValid()) { - edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU"); - iEvent.getByLabel(triggerResultsLabelFU,triggerResults); + iEvent.getByToken(triggerResultsTokenFU_, triggerResults); if(!triggerResults.isValid()) { edm::LogInfo("FourVectorHLTOnline") << "TriggerResults not found, " "skipping event"; @@ -203,11 +191,10 @@ FourVectorHLTOnline::analyze(const edm::Event& iEvent, const edm::EventSetup& iS const edm::TriggerNames & triggerNames = iEvent.triggerNames(*triggerResults); int npath = triggerResults->size(); - iEvent.getByLabel(triggerSummaryLabel_,fTriggerObj); + iEvent.getByToken(triggerSummaryToken_, fTriggerObj); if(!fTriggerObj.isValid()) { - edm::InputTag triggerSummaryLabelFU(triggerSummaryLabel_.label(),triggerSummaryLabel_.instance(), "FU"); - iEvent.getByLabel(triggerSummaryLabelFU,fTriggerObj); + iEvent.getByToken(triggerSummaryLabelFUToken_, fTriggerObj); if(!fTriggerObj.isValid()) { @@ -219,7 +206,7 @@ FourVectorHLTOnline::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } edm::Handle muonHandle; - iEvent.getByLabel(muonRecoCollectionName_,muonHandle); + iEvent.getByToken(muonRecoCollectionNameToken_, muonHandle); if(!muonHandle.isValid()) { edm::LogInfo("FourVectorHLTOnline") << "muonHandle not found, "; @@ -230,44 +217,44 @@ FourVectorHLTOnline::analyze(const edm::Event& iEvent, const edm::EventSetup& iS edm::Handle gsfElectrons; - iEvent.getByLabel("gsfElectrons",gsfElectrons); + iEvent.getByToken(gsfElectronsToken_, gsfElectrons); if(!gsfElectrons.isValid()) edm::LogInfo("FourVectorHLTOnline") << "gsfElectrons not found, "; edm::Handle tauHandle; - iEvent.getByLabel("caloRecoTauProducer",tauHandle); + iEvent.getByToken(caloRecoTauProducerToken_, tauHandle); if(!tauHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "tauHandle not found, "; edm::Handle jetHandle; - iEvent.getByLabel("iterativeCone5CaloJets",jetHandle); + iEvent.getByToken(iterativeCone5CaloJetsToken_, jetHandle); if(!jetHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "jetHandle not found, "; // Get b tag information edm::Handle bTagIPHandle; - iEvent.getByLabel("jetProbabilityBJetTags", bTagIPHandle); + iEvent.getByToken(jetProbabilityBJetTagsToken_, bTagIPHandle); if (!bTagIPHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "mTagIPHandle trackCountingHighEffJetTags not found, "; // Get b tag information edm::Handle bTagMuHandle; - iEvent.getByLabel("softMuonBJetTags", bTagMuHandle); + iEvent.getByToken(softMuonBJetTagsToken_, bTagMuHandle); if (!bTagMuHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "bTagMuHandle not found, "; edm::Handle metHandle; - iEvent.getByLabel("met",metHandle); + iEvent.getByToken(metToken_, metHandle); if(!metHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "metHandle not found, "; edm::Handle photonHandle; - iEvent.getByLabel("photons",photonHandle); + iEvent.getByToken(photonsToken_, photonHandle); if(!photonHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "photonHandle not found, "; edm::Handle trackHandle; - iEvent.getByLabel("pixelTracks",trackHandle); + iEvent.getByToken(pixelTracksToken_, trackHandle); if(!trackHandle.isValid()) edm::LogInfo("FourVectorHLTOnline") << "trackHandle not found, "; diff --git a/DQM/HLTEvF/plugins/HLTAlCaMonEcalPhiSym.cc b/DQM/HLTEvF/plugins/HLTAlCaMonEcalPhiSym.cc index 39f4a809bbcf8..2f234b638f14e 100644 --- a/DQM/HLTEvF/plugins/HLTAlCaMonEcalPhiSym.cc +++ b/DQM/HLTEvF/plugins/HLTAlCaMonEcalPhiSym.cc @@ -102,7 +102,9 @@ eventCounter_(0) hMeanRecHitEnergyEE_min_ = ps.getUntrackedParameter("hMeanRecHitEnergyEE_min",0); hMeanRecHitEnergyEE_max_ = ps.getUntrackedParameter("hMeanRecHitEnergyEE_max",5); - + //set Token(-s) + productMonitoredEBToken_ = consumes(ps.getUntrackedParameter("AlCaStreamEBTag")); + productMonitoredEEToken_ = consumes(ps.getUntrackedParameter("AlCaStreamEETag")); } @@ -220,9 +222,9 @@ void HLTAlCaMonEcalPhiSym::analyze(const Event& iEvent, edm::Handle rhEB; edm::Handle rhEE; - - iEvent.getByLabel(productMonitoredEB_, rhEB); - iEvent.getByLabel(productMonitoredEE_, rhEE); + + iEvent.getByToken(productMonitoredEBToken_, rhEB); + iEvent.getByToken(productMonitoredEEToken_, rhEE); EcalRecHitCollection::const_iterator itb; diff --git a/DQM/HLTEvF/plugins/HLTAlCaMonPi0.cc b/DQM/HLTEvF/plugins/HLTAlCaMonPi0.cc index 58c2d32914192..2afa918cbf192 100755 --- a/DQM/HLTEvF/plugins/HLTAlCaMonPi0.cc +++ b/DQM/HLTEvF/plugins/HLTAlCaMonPi0.cc @@ -136,6 +136,11 @@ eventCounter_(0) ps.getParameter("posCalcParameters"); posCalculator_ = PositionCalc(posCalcParameters); + //set Token(-s) + productMonitoredEBpi0Token_ = consumes(ps.getUntrackedParameter("AlCaStreamEBpi0Tag")); + productMonitoredEBetaToken_ = consumes(ps.getUntrackedParameter("AlCaStreamEBetaTag")); + productMonitoredEEpi0Token_ = consumes(ps.getUntrackedParameter("AlCaStreamEEpi0Tag")); + productMonitoredEEetaToken_ = consumes(ps.getUntrackedParameter("AlCaStreamEEetaTag")); } @@ -374,7 +379,7 @@ void HLTAlCaMonPi0::analyze(const Event& iEvent, bool GetRecHitsCollectionEBpi0 = true; if(isMonEBpi0_) { try { - iEvent.getByLabel(productMonitoredEBpi0_, rhEBpi0); + iEvent.getByToken(productMonitoredEBpi0Token_, rhEBpi0); }catch( cms::Exception& exception ) { LogDebug("HLTAlCaPi0DQMSource") << "no EcalRecHits EB_pi0, can not run all stuffs" << iEvent.eventAuxiliary ().event() <<" run: "<("htMin",0.0); sumEtMin_ = iConfig.getUntrackedParameter("sumEtMin",0.0); - - + //set Token(-s) + triggerResultsToken_ = consumes(iConfig.getParameter("triggerResultsLabel")); + edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU"); + triggerResultsTokenFU_ = consumes(triggerResultsLabelFU); + triggerSummaryToken_ = consumes(iConfig.getParameter("triggerSummaryLabel")); + edm::InputTag triggerSummaryLabelFU(triggerSummaryLabel_.label(),triggerSummaryLabel_.instance(), "FU"); + triggerSummaryTokenFU_ = consumes(triggerSummaryLabelFU); } @@ -149,10 +154,9 @@ HLTJetMETDQMSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe edm::Handle triggerResults; - iEvent.getByLabel(triggerResultsLabel_,triggerResults); + iEvent.getByToken(triggerResultsToken_, triggerResults); if(!triggerResults.isValid()) { - edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU"); - iEvent.getByLabel(triggerResultsLabelFU,triggerResults); + iEvent.getByToken(triggerResultsTokenFU_, triggerResults); if(!triggerResults.isValid()) { LogWarning("HLTJetMETDQMSource") << "TriggerResults not found, skipping event" << std::endl; return; @@ -162,10 +166,9 @@ HLTJetMETDQMSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe unsigned int npath = triggerResults->size(); edm::Handle triggerObj; - iEvent.getByLabel(triggerSummaryLabel_,triggerObj); + iEvent.getByToken(triggerSummaryToken_, triggerObj); if(!triggerObj.isValid()) { - edm::InputTag triggerSummaryLabelFU(triggerSummaryLabel_.label(),triggerSummaryLabel_.instance(), "FU"); - iEvent.getByLabel(triggerSummaryLabelFU,triggerObj); + iEvent.getByToken(triggerSummaryTokenFU_, triggerObj); if(!triggerObj.isValid()) { LogWarning("HLTJetMETDQMSource") << "TriggerEvent not found, skipping event" << std::endl; return; diff --git a/DQM/HLTEvF/plugins/HLTMonBTagIPSource.cc b/DQM/HLTEvF/plugins/HLTMonBTagIPSource.cc index 270d65c9f0731..cd570e6a5b704 100644 --- a/DQM/HLTEvF/plugins/HLTMonBTagIPSource.cc +++ b/DQM/HLTEvF/plugins/HLTMonBTagIPSource.cc @@ -103,6 +103,13 @@ HLTMonBTagIPSource::HLTMonBTagIPSource(const edm::ParameterSet & config) : m_plotL3IP3ndTrack3dSig(0), m_plotL3Discriminator(0) { + //set Token(-s) + m_triggerResultsToken_ = consumes(config.getParameter("triggerResults")); + m_L2JetsToken_ = consumes >(config.getParameter("L2Jets")); + m_L25TagInfoToken_ = consumes(config.getParameter("L25TagInfo")); + m_L25JetTagsToken_ = consumes(config.getParameter("L25JetTags")); + m_L3TagInfoToken_ = consumes(config.getParameter("L3TagInfo")); + m_L3JetTagsToken_ = consumes(config.getParameter("L3JetTags")); } HLTMonBTagIPSource::~HLTMonBTagIPSource(void) { @@ -235,13 +242,13 @@ void HLTMonBTagIPSource::analyze(const edm::Event & event, const edm::EventSetup edm::Handle h_L25JetTags; edm::Handle h_L3TagInfo; edm::Handle h_L3JetTags; - - event.getByLabel(m_triggerResults, h_triggerResults); - event.getByLabel(m_L2Jets, h_L2Jets); - event.getByLabel(m_L25TagInfo, h_L25TagInfo); - event.getByLabel(m_L25JetTags, h_L25JetTags); - event.getByLabel(m_L3TagInfo, h_L3TagInfo); - event.getByLabel(m_L3JetTags, h_L3JetTags); + + event.getByToken(m_triggerResultsToken_, h_triggerResults); + event.getByToken(m_L2JetsToken_, h_L2Jets); + event.getByToken(m_L25TagInfoToken_, h_L25TagInfo); + event.getByToken(m_L25JetTagsToken_, h_L25JetTags); + event.getByToken(m_L3TagInfoToken_, h_L3TagInfo); + event.getByToken(m_L3JetTagsToken_, h_L3JetTags); // check if this path passed the L1, L2, L2.5 and L3 filters bool wasrun = false; diff --git a/DQM/HLTEvF/plugins/HLTMonBTagIPSource.h b/DQM/HLTEvF/plugins/HLTMonBTagIPSource.h index 4ca18d87f29cd..d5e45eb678262 100644 --- a/DQM/HLTEvF/plugins/HLTMonBTagIPSource.h +++ b/DQM/HLTEvF/plugins/HLTMonBTagIPSource.h @@ -117,6 +117,14 @@ class HLTMonBTagIPSource : public edm::EDAnalyzer { MonitorElement * m_plotL3IP3ndTrack3d; MonitorElement * m_plotL3IP3ndTrack3dSig; MonitorElement * m_plotL3Discriminator; + + //define Token(-s) + edm::EDGetTokenT m_triggerResultsToken_; + edm::EDGetTokenT > m_L2JetsToken_; + edm::EDGetTokenT m_L25TagInfoToken_; + edm::EDGetTokenT m_L25JetTagsToken_; + edm::EDGetTokenT m_L3TagInfoToken_; + edm::EDGetTokenT m_L3JetTagsToken_; }; #endif // DQM_HLTEvF_HLTMonBTagIPSource_H diff --git a/DQM/HLTEvF/plugins/HLTMonBTagMuSource.cc b/DQM/HLTEvF/plugins/HLTMonBTagMuSource.cc index 8075bd0c36f1d..38210a080a458 100644 --- a/DQM/HLTEvF/plugins/HLTMonBTagMuSource.cc +++ b/DQM/HLTEvF/plugins/HLTMonBTagMuSource.cc @@ -96,6 +96,13 @@ HLTMonBTagMuSource::HLTMonBTagMuSource(const edm::ParameterSet & config) : m_plotL3MuonDeltaR(0), m_plotL3Discriminator(0) { + //set Token(-s) + m_triggerResultsToken_ = consumes(config.getParameter("triggerResults")); + m_L2JetsToken_ = consumes >(config.getParameter("L2Jets")); + m_L25TagInfoToken_ = consumes(config.getParameter("L25TagInfo")); + m_L25JetTagsToken_ = consumes(config.getParameter("L25JetTags")); + m_L3TagInfoToken_ = consumes(config.getParameter("L3TagInfo")); + m_L3JetTagsToken_ = consumes(config.getParameter("L3JetTags")); } HLTMonBTagMuSource::~HLTMonBTagMuSource(void) { @@ -220,13 +227,13 @@ void HLTMonBTagMuSource::analyze(const edm::Event & event, const edm::EventSetup edm::Handle h_L25JetTags; edm::Handle h_L3TagInfo; edm::Handle h_L3JetTags; - - event.getByLabel(m_triggerResults, h_triggerResults); - event.getByLabel(m_L2Jets, h_L2Jets); - event.getByLabel(m_L25TagInfo, h_L25TagInfo); - event.getByLabel(m_L25JetTags, h_L25JetTags); - event.getByLabel(m_L3TagInfo, h_L3TagInfo); - event.getByLabel(m_L3JetTags, h_L3JetTags); + + event.getByToken(m_triggerResultsToken_, h_triggerResults); + event.getByToken(m_L2JetsToken_, h_L2Jets); + event.getByToken(m_L25TagInfoToken_, h_L25TagInfo); + event.getByToken(m_L25JetTagsToken_, h_L25JetTags); + event.getByToken(m_L3TagInfoToken_, h_L3TagInfo); + event.getByToken(m_L3JetTagsToken_, h_L3JetTags); // check if this path passed the L1, L2, L2.5 and L3 filters bool wasrun = false; diff --git a/DQM/HLTEvF/plugins/HLTMonBTagMuSource.h b/DQM/HLTEvF/plugins/HLTMonBTagMuSource.h index a0bb7b5366ff0..54ece74bbb41f 100644 --- a/DQM/HLTEvF/plugins/HLTMonBTagMuSource.h +++ b/DQM/HLTEvF/plugins/HLTMonBTagMuSource.h @@ -109,6 +109,14 @@ class HLTMonBTagMuSource : public edm::EDAnalyzer { MonitorElement * m_plotL3MuonPtRel; MonitorElement * m_plotL3MuonDeltaR; MonitorElement * m_plotL3Discriminator; + + //define Token(-s) + edm::EDGetTokenT m_triggerResultsToken_; + edm::EDGetTokenT > m_L2JetsToken_; + edm::EDGetTokenT m_L25TagInfoToken_; + edm::EDGetTokenT m_L25JetTagsToken_; + edm::EDGetTokenT m_L3TagInfoToken_; + edm::EDGetTokenT m_L3JetTagsToken_; }; #endif // DQM_HLTEvF_HLTMonBTagMuSource_H diff --git a/DQM/HLTEvF/plugins/HLTMonBitSummary.cc b/DQM/HLTEvF/plugins/HLTMonBitSummary.cc index dc847b09cf078..ae626e397fcf3 100644 --- a/DQM/HLTEvF/plugins/HLTMonBitSummary.cc +++ b/DQM/HLTEvF/plugins/HLTMonBitSummary.cc @@ -62,6 +62,8 @@ HLTMonBitSummary::HLTMonBitSummary(const edm::ParameterSet& iConfig) : dbe_ = edm::Service < DQMStore > ().operator->(); dbe_->setVerbose(0); + //set Token(-s) + inputToken_ = consumes(iConfig.getParameter ("TriggerResultsTag")); } @@ -299,7 +301,7 @@ HLTMonBitSummary::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu // get hold of TriggerResults Object edm::Handle trh; - iEvent.getByLabel(inputTag_,trh); + iEvent.getByToken(inputToken_, trh); if (trh.failedToGet()) { edm::LogError("HLTMonBitSummary")<<" could not get: "<getParameter("hltL3filterLabel")); l2collectionLabels_.push_back(inTrig->getParameter("l2collectionLabel")); l3collectionLabels_.push_back(inTrig->getParameter("l3collectionLabel")); + l2collectionToken_.push_back(consumes(inTrig->getParameter("l2collectionLabel"))); + l3collectionToken_.push_back(consumes(inTrig->getParameter("l3collectionLabel"))); } + + //set Token(-s) + toLabToken_ = consumes(edm::InputTag(hltRAWEventTag_,"",hltProcess_)); } @@ -112,7 +117,7 @@ void HLTMonHcalIsoTrack::analyze(const edm::Event& iEvent, const edm::EventSetup { edm::Handle triggerObj; edm::InputTag toLab=edm::InputTag(hltRAWEventTag_,"",hltProcess_); - iEvent.getByLabel(toLab,triggerObj); + iEvent.getByToken(toLabToken_, triggerObj); if(!triggerObj.isValid()) return; for (unsigned int trInd=0; trIndFill(2+0.0001,1); if (useProducerCollections_) { - iEvent.getByLabel(l3collectionLabels_[trInd],l3col); + iEvent.getByToken(l3collectionToken_[trInd], l3col); if(!l3col.isValid()) continue; for (reco::IsolatedPixelTrackCandidateCollection::const_iterator l3it=l3col->begin(); l3it!=l3col->end(); ++l3it) @@ -215,7 +220,7 @@ void HLTMonHcalIsoTrack::analyze(const edm::Event& iEvent, const edm::EventSetup edm::InputTag l2colTag=edm::InputTag(l2collectionLabels_[trInd],"",hltProcess_); if (useProducerCollections_) { - iEvent.getByLabel(l2collectionLabels_[trInd],l2col); + iEvent.getByToken(l2collectionToken_[trInd], l2col); if(!l2col.isValid()) continue; for (reco::IsolatedPixelTrackCandidateCollection::const_iterator l2it=l2col->begin(); l2it!=l2col->end(); l2it++) { diff --git a/DQM/HLTEvF/plugins/HLTMonSimpleBTag.cc b/DQM/HLTEvF/plugins/HLTMonSimpleBTag.cc index e01cc3b577c13..3a7dae275fd7d 100644 --- a/DQM/HLTEvF/plugins/HLTMonSimpleBTag.cc +++ b/DQM/HLTEvF/plugins/HLTMonSimpleBTag.cc @@ -76,6 +76,9 @@ HLTMonSimpleBTag::HLTMonSimpleBTag(const edm::ParameterSet& iConfig): } triggerSummaryLabel_ = iConfig.getParameter("triggerSummaryLabel"); + + //set Token(-s) + triggerSummaryToken_ = consumes(iConfig.getParameter("triggerSummaryLabel")); } @@ -102,7 +105,7 @@ HLTMonSimpleBTag::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu LogDebug("Status")<< "analyze" ; edm::Handle triggerObj; - iEvent.getByLabel(triggerSummaryLabel_,triggerObj); + iEvent.getByToken(triggerSummaryToken_, triggerObj); if(!triggerObj.isValid()) { edm::LogInfo("Status") << "Summary HLT object (TriggerEvent) not found, " "skipping event"; diff --git a/DQM/HLTEvF/plugins/HLTOniaSource.cc b/DQM/HLTEvF/plugins/HLTOniaSource.cc index f08df9cb8425f..3cea0cd563d84 100644 --- a/DQM/HLTEvF/plugins/HLTOniaSource.cc +++ b/DQM/HLTEvF/plugins/HLTOniaSource.cc @@ -68,6 +68,12 @@ HLTOniaSource::HLTOniaSource(const edm::ParameterSet& pset){ //Foldering output subsystemFolder_ = pset.getUntrackedParameter("SubSystemFolder","HLT/HLTMonMuon/Onia"); + + //set Token(-s) + pixelToken_ = consumes(pset.getUntrackedParameter("PixelTag",edm::InputTag("hltPixelTracks", "", "HLT"))); + trackToken_ = consumes(pset.getUntrackedParameter("TrackTag",edm::InputTag("hltMuTrackJpsiCtfTrackCands","", "HLT"))); + beamSpotToken_ = consumes(pset.getUntrackedParameter("BeamSpotTag",edm::InputTag("hltOfflineBeamSpot", "", "HLT"))); + triggerSummaryRAWToken_ = consumes(pset.getUntrackedParameter("TriggerSummaryTag",edm::InputTag("hltTriggerSummaryRAW", "", "HLT"))); } @@ -144,7 +150,7 @@ void HLTOniaSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe //Get Pixel Tracks edm::Handle pixelCands; - iEvent.getByLabel(pixelTag_, pixelCands); + iEvent.getByToken(pixelToken_, pixelCands); reco::TrackCollection mypixelCands; //This is needed for the sort!!!! if (pixelCands.isValid()) { @@ -157,7 +163,7 @@ void HLTOniaSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe //Get Tracker Tracks edm::Handle trackCands; - iEvent.getByLabel(trackTag_, trackCands); + iEvent.getByToken(trackToken_, trackCands); reco::RecoChargedCandidateCollection mytrackCands; //This is needed for the sort!!!! if(trackCands.isValid()) { mytrackCands = * trackCands; @@ -169,7 +175,7 @@ void HLTOniaSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe //Get Beamspot edm::Handle recoBeamSpotHandle; - iEvent.getByLabel(beamSpotTag_, recoBeamSpotHandle); + iEvent.getByToken(beamSpotToken_, recoBeamSpotHandle); if (recoBeamSpotHandle.isValid()) { BSPosition_ = recoBeamSpotHandle->position(); }else { @@ -179,8 +185,7 @@ void HLTOniaSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe //Get Trigger Summary RA edm::Handle rawTriggerEvent; - iEvent.getByLabel(triggerSummaryRAWTag_, rawTriggerEvent ); - + iEvent.getByToken(triggerSummaryRAWToken_, rawTriggerEvent); if( rawTriggerEvent.isValid() ){ for(size_t i=0; i triggerResultsToken_; + edm::EDGetTokenT aodTriggerToken_; + edm::EDGetTokenT dcsStatusToken_; + edm::EDGetTokenT lumiScalersToken_; }; // @@ -139,7 +144,11 @@ OccupancyPlotter::OccupancyPlotter(const edm::ParameterSet& iConfig) if (debugPrint) std::cout << "Got plot dirname = " << plotDirectoryName << std::endl; - + //set Token(-s) + triggerResultsToken_ = consumes(InputTag("TriggerResults","", "HLT")); + aodTriggerToken_ = consumes(InputTag("hltTriggerSummaryAOD", "", "HLT")); + dcsStatusToken_ = consumes(std::string("hltScalersRawToDigi")); + lumiScalersToken_ = consumes(InputTag("hltScalersRawToDigi","","")); } @@ -193,7 +202,7 @@ OccupancyPlotter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu // Access Trigger Results edm::Handle triggerResults; - iEvent.getByLabel(InputTag("TriggerResults","", "HLT"), triggerResults); + iEvent.getByToken(triggerResultsToken_, triggerResults); if (!triggerResults.isValid()) { if (debugPrint) std::cout << "Trigger results not valid" << std::endl; @@ -202,7 +211,7 @@ OccupancyPlotter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu if (debugPrint) std::cout << "Found triggerResults" << std::endl; edm::Handle aodTriggerEvent; - iEvent.getByLabel(InputTag("hltTriggerSummaryAOD", "", "HLT"), aodTriggerEvent); + iEvent.getByToken(aodTriggerToken_, aodTriggerEvent); if ( !aodTriggerEvent.isValid() ) { if (debugPrint) std::cout << "No AOD trigger summary found! Returning..."; @@ -509,7 +518,7 @@ bool OccupancyPlotter::checkDcsInfo (const edm::Event & jEvent) { //Copy of code from DQMServices/Components/src/DQMDcsInfo.cc edm::Handle dcsStatus; - if ( ! jEvent.getByLabel("hltScalersRawToDigi", dcsStatus) ) + if (! jEvent.getByToken(dcsStatusToken_, dcsStatus)) { std::cout << "[OccupancyPlotter::checkDcsInfo] Could not get scalersRawToDigi by label\n" ; for (int i=0;i<24;i++) dcs[i]=false; @@ -577,7 +586,7 @@ void OccupancyPlotter::checkLumiInfo (const edm::Event & jEvent) { if (debugPrint) std::cout << "Inside method check lumi info" << std::endl; edm::Handle lumiScalers; - bool lumiHandleOK = jEvent.getByLabel(InputTag("hltScalersRawToDigi","",""), lumiScalers); + bool lumiHandleOK = jEvent.getByToken(lumiScalersToken_, lumiScalers); if (!lumiHandleOK || !lumiScalers.isValid()){ if (debugPrint) std::cout << "scalers not valid" << std::endl; diff --git a/DQM/HLTEvF/plugins/TrigResRateMon.cc b/DQM/HLTEvF/plugins/TrigResRateMon.cc index e76f22ee6d19f..8db9fe8a8e640 100644 --- a/DQM/HLTEvF/plugins/TrigResRateMon.cc +++ b/DQM/HLTEvF/plugins/TrigResRateMon.cc @@ -184,7 +184,12 @@ TrigResRateMon::TrigResRateMon(const edm::ParameterSet& iConfig): currentRun_(-9 jmsFakeZBCounts = false; found_zbIndex = false; if (jmsDebug ) std::cout << "Printing extra info " << std::endl; - + + //set Token(-s) + triggerResultsToken_ = consumes(iConfig.getParameter("triggerResultsLabel")); + edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU"); + triggerResultsTokenFU_ = consumes(triggerResultsLabelFU); + lumiScalersToken_ = consumes(InputTag("hltScalersRawToDigi","","")); } @@ -215,10 +220,10 @@ TrigResRateMon::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) edm::Handle triggerResults; - iEvent.getByLabel(triggerResultsLabel_,triggerResults); + iEvent.getByToken(triggerResultsToken_, triggerResults); if(!triggerResults.isValid()) { edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU"); - iEvent.getByLabel(triggerResultsLabelFU,triggerResults); + iEvent.getByToken(triggerResultsTokenFU_, triggerResults); if(!triggerResults.isValid()) { edm::LogInfo("TrigResRateMon") << "TriggerResults not found, " "skipping event"; @@ -276,7 +281,8 @@ TrigResRateMon::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) //////////////////////////////////////////////////////////// edm::Handle lumiScalers; - bool lumiHandleOK = iEvent.getByLabel(InputTag("hltScalersRawToDigi","",""), lumiScalers); + + bool lumiHandleOK = iEvent.getByToken(lumiScalersToken_, lumiScalers); if (jmsDebug) std::cout << "Tried to get lumi handle result = " << lumiHandleOK << std::endl;