getByLabel to getByToken migration in DQM/HLTEvF package

Signed-off-by: Antanas Norkus <[email protected]>

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<trigger::TriggerEvent> triggerSummaryToken_;
+
       // helper class to store the data
       class PathInfo {
 	PathInfo():

DQM/HLTEvF/interface/FourVectorHLTOnline.h

@@ -211,6 +211,21 @@ class FourVectorHLTOnline : public edm::EDAnalyzer {
 
       edm::Handle<edm::TriggerResults> triggerResults_;
 
+      //define Token(-s)
+      edm::EDGetTokenT<edm::TriggerResults> triggerResultsToken_;
+      edm::EDGetTokenT<trigger::TriggerEvent> triggerSummaryToken_;
+      edm::EDGetTokenT<edm::TriggerResults> muonRecoCollectionNameToken_;
+      edm::EDGetTokenT<edm::TriggerResults> gsfElectronsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> caloRecoTauProducerToken_;
+      edm::EDGetTokenT<edm::TriggerResults> iterativeCone5CaloJetsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> jetProbabilityBJetTagsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> softMuonBJetTagsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> metToken_;
+      edm::EDGetTokenT<edm::TriggerResults> photonsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> pixelTracksToken_;
+      edm::EDGetTokenT<edm::TriggerResults> triggerResultsTokenFU_;
+      edm::EDGetTokenT<trigger::TriggerEvent> triggerSummaryLabelFUToken_;
+
       class PathInfo {
 
        PathInfo():

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<EcalRecHitCollection> productMonitoredEBToken_;
+  edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEEToken_;
 };
 
 #endif

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<EcalRecHitCollection> productMonitoredEBpi0Token_;
+  edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEBetaToken_;
+  edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEEpi0Token_;
+  edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEEetaToken_;
 };
 
 #endif

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<edm::TriggerResults> triggerResultsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> triggerResultsTokenFU_;
+      edm::EDGetTokenT<trigger::TriggerEvent> triggerSummaryToken_;
+      edm::EDGetTokenT<trigger::TriggerEvent> triggerSummaryTokenFU_;
       // helper class to store the data path
 
       class PathInfo {

DQM/HLTEvF/interface/HLTMonBitSummary.h

@@ -92,5 +92,7 @@ class HLTMonBitSummary : public edm::EDAnalyzer {
   MonitorElement * pf_;
   MonitorElement * ratio_;
 
+  //define Token(-s)
+  edm::EDGetTokenT<edm::TriggerResults> inputToken_;
 };
 #endif

DQM/HLTEvF/interface/HLTMonHcalIsoTrack.h

@@ -14,6 +14,8 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+
 #include <fstream>
 
 class HLTMonHcalIsoTrack : public edm::EDAnalyzer {
@@ -73,6 +75,10 @@ class HLTMonHcalIsoTrack : public edm::EDAnalyzer {
   std::vector<MonitorElement*> hL1eta;
   std::vector<MonitorElement*> hL1phi;
 
+  //define Token(-s)
+  edm::EDGetTokenT<trigger::TriggerEventWithRefs> toLabToken_;
+  std::vector<edm::EDGetTokenT<reco::IsolatedPixelTrackCandidateCollection> > l2collectionToken_;
+  std::vector<edm::EDGetTokenT<reco::IsolatedPixelTrackCandidateCollection> > l3collectionToken_;
 };
 
 

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<trigger::TriggerEvent> triggerSummaryToken_;
+
   // helper class to store the data
   class PathInfo {
     PathInfo():

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<std::string, MonitorElement *> trackME_;
       std::map<std::string, MonitorElement *> massME_;
       bool hltConfigInit_;
-
+
+      //define Token(-s)
+      edm::EDGetTokenT<reco::TrackCollection> pixelToken_;
+      edm::EDGetTokenT<reco::RecoChargedCandidateCollection> trackToken_;
+      edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
+      edm::EDGetTokenT<trigger::TriggerEventWithRefs> triggerSummaryRAWToken_;
 };
 
 #endif

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 <iostream>
 #include <fstream>
@@ -323,6 +325,12 @@ class TrigResRateMon : public edm::EDAnalyzer {
 
       edm::Handle<edm::TriggerResults> triggerResults_;
 
+      //define Token(-s)
+      edm::EDGetTokenT<edm::TriggerResults> triggerResultsToken_;
+      edm::EDGetTokenT<edm::TriggerResults> triggerResultsTokenFU_;
+      edm::EDGetTokenT<LumiScalersCollection> lumiScalersToken_;
+
+
 
   // create a class that can store all the strings
   // associated with a primary dataset

DQM/HLTEvF/plugins/FourVectorHLT.cc

@@ -63,6 +63,9 @@ FourVectorHLT::FourVectorHLT(const edm::ParameterSet& iConfig):
   }
   triggerSummaryLabel_ = 
     iConfig.getParameter<edm::InputTag>("triggerSummaryLabel");
+
+  //set Token(-s)
+  triggerSummaryToken_ = consumes<trigger::TriggerEvent>(iConfig.getParameter<edm::InputTag>("triggerSummaryLabel"));
 }
 
 
@@ -89,7 +92,7 @@ FourVectorHLT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
   LogDebug("Status")<< "analyze" ;
 
   edm::Handle<TriggerEvent> triggerObj;
-  iEvent.getByLabel(triggerSummaryLabel_,triggerObj); 
+  iEvent.getByToken(triggerSummaryToken_, triggerObj);
   if(!triggerObj.isValid()) { 
     edm::LogInfo("Status") << "Summary HLT object (TriggerEvent) not found, "
       "skipping event"; 

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<TriggerResults>(iConfig.getParameter<edm::InputTag>("triggerResultsLabel"));
+  triggerSummaryToken_ = consumes<trigger::TriggerEvent>(iConfig.getParameter<edm::InputTag>("triggerSummaryLabel"));
+  muonRecoCollectionNameToken_ = consumes<TriggerResults>(iConfig.getUntrackedParameter("muonRecoCollectionName", std::string("muons")));
+  gsfElectronsToken_ = consumes<TriggerResults>(std::string("gsfElectrons"));
+  caloRecoTauProducerToken_ = consumes<TriggerResults>(std::string("caloRecoTauProducer"));
+  iterativeCone5CaloJetsToken_ = consumes<TriggerResults>(std::string("iterativeCone5CaloJets"));
+  jetProbabilityBJetTagsToken_ = consumes<TriggerResults>(std::string("jetProbabilityBJetTags"));
+  softMuonBJetTagsToken_ = consumes<TriggerResults>(std::string("softMuonBJetTags"));
+  metToken_ = consumes<TriggerResults>(std::string("met"));
+  photonsToken_ = consumes<TriggerResults>(std::string("photons"));
+  pixelTracksToken_ = consumes<TriggerResults>(std::string("pixelTracks"));
+  edm::InputTag triggerResultsLabelFU(triggerResultsLabel_.label(),triggerResultsLabel_.instance(), "FU");
+  triggerResultsTokenFU_ = consumes<TriggerResults>(triggerResultsLabelFU);
+  edm::InputTag triggerSummaryLabelFU(triggerSummaryLabel_.label(),triggerSummaryLabel_.instance(), "FU");
+  triggerSummaryLabelFUToken_ = consumes<trigger::TriggerEvent>(triggerSummaryLabelFU);
+
 }
 
 
@@ -158,41 +175,12 @@ FourVectorHLTOnline::analyze(const edm::Event& iEvent, const edm::EventSetup& iS
   ++nev_;
   LogDebug("FourVectorHLTOnline")<< " analyze...." ;
 
-
-
-  /*
-  Handle<GenParticleCollection> genParticles;
-  iEvent.getByLabel("genParticles", genParticles);
-  if(!genParticles.isValid()) { 
-    edm::LogInfo("FourVectorHLTOnline") << "genParticles not found, "
-      "skipping event"; 
-    return;
-  }
-
-  Handle<GenJetCollection> genJets;
-  iEvent.getByLabel("iterativeCone5GenJets",genJets);
-  if(!genJets.isValid()) { 
-    edm::LogInfo("FourVectorHLTOnline") << "genJets not found, "
-      "skipping event"; 
-    return;
-  }
-
-  Handle<GenMETCollection> genMets;
-  iEvent.getByLabel("genMetTrue",genMets);
-  if(!genMets.isValid()) { 
-    edm::LogInfo("FourVectorHLTOnline") << "genMets not found, "
-      "skipping event"; 
-    return;
-  }
-  */
-
   // Get trigger results
 
   edm::Handle<TriggerResults> 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<TriggerResults> 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<TriggerResults> gsfElectrons;
-  iEvent.getByLabel("gsfElectrons",gsfElectrons); 
+  iEvent.getByToken(gsfElectronsToken_, gsfElectrons);
   if(!gsfElectrons.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "gsfElectrons not found, ";
 
   edm::Handle<TriggerResults> tauHandle;
-  iEvent.getByLabel("caloRecoTauProducer",tauHandle);
+  iEvent.getByToken(caloRecoTauProducerToken_, tauHandle);
   if(!tauHandle.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "tauHandle not found, ";
 
   edm::Handle<TriggerResults> jetHandle;
-  iEvent.getByLabel("iterativeCone5CaloJets",jetHandle);
+  iEvent.getByToken(iterativeCone5CaloJetsToken_, jetHandle);
   if(!jetHandle.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "jetHandle not found, ";
 
    // Get b tag information
  edm::Handle<TriggerResults> 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<TriggerResults> bTagMuHandle;
- iEvent.getByLabel("softMuonBJetTags", bTagMuHandle);
+ iEvent.getByToken(softMuonBJetTagsToken_, bTagMuHandle);
  if (!bTagMuHandle.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "bTagMuHandle  not found, ";
 
   edm::Handle<TriggerResults> metHandle;
-  iEvent.getByLabel("met",metHandle);
+  iEvent.getByToken(metToken_, metHandle);
   if(!metHandle.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "metHandle not found, ";
 
   edm::Handle<TriggerResults> photonHandle;
-  iEvent.getByLabel("photons",photonHandle);
+  iEvent.getByToken(photonsToken_, photonHandle);
   if(!photonHandle.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "photonHandle not found, ";
 
   edm::Handle<TriggerResults> trackHandle;
-  iEvent.getByLabel("pixelTracks",trackHandle);
+  iEvent.getByToken(pixelTracksToken_, trackHandle);
   if(!trackHandle.isValid()) 
     edm::LogInfo("FourVectorHLTOnline") << "trackHandle not found, ";
 

DQM/HLTEvF/plugins/HLTAlCaMonEcalPhiSym.cc

@@ -102,7 +102,9 @@ eventCounter_(0)
   hMeanRecHitEnergyEE_min_ = ps.getUntrackedParameter<double>("hMeanRecHitEnergyEE_min",0); 
   hMeanRecHitEnergyEE_max_ = ps.getUntrackedParameter<double>("hMeanRecHitEnergyEE_max",5);
 
-
+  //set Token(-s)
+  productMonitoredEBToken_ = consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEBTag"));
+  productMonitoredEEToken_ = consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEETag"));
 
 }
 
@@ -220,9 +222,9 @@ void HLTAlCaMonEcalPhiSym::analyze(const Event& iEvent,
 
   edm::Handle<EcalRecHitCollection> rhEB;
   edm::Handle<EcalRecHitCollection> rhEE;
- 
-  iEvent.getByLabel(productMonitoredEB_, rhEB); 
-  iEvent.getByLabel(productMonitoredEE_, rhEE);
+
+  iEvent.getByToken(productMonitoredEBToken_, rhEB);
+  iEvent.getByToken(productMonitoredEEToken_, rhEE);
 
   EcalRecHitCollection::const_iterator itb;