Fix consumes

Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotProducer.cc

@@ -20,6 +20,7 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -39,7 +40,7 @@ AlcaBeamSpotProducer::AlcaBeamSpotProducer(const edm::ParameterSet& iConfig){
   resetFitNLumi_   = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getUntrackedParameter<int>("resetEveryNLumi",-1);
   runbeamwidthfit_ = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("RunBeamWidthFit");
 
-  theBeamFitter = new BeamFitter(iConfig);
+  theBeamFitter = new BeamFitter(iConfig, consumesCollector());
   theBeamFitter->resetTrkVector();
   theBeamFitter->resetLSRange();
   theBeamFitter->resetCutFlow();

DQM/BeamMonitor/plugins/AlcaBeamMonitor.cc

@@ -21,6 +21,7 @@
 #include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include <numeric>
 //#include <iostream>
 
@@ -29,26 +30,29 @@ using namespace edm;
 using namespace reco;
 
 //----------------------------------------------------------------------------------------------------------------------
-AlcaBeamMonitor::AlcaBeamMonitor( const ParameterSet& ps ) : 
+AlcaBeamMonitor::AlcaBeamMonitor( const ParameterSet& ps ) :
   parameters_         	(ps),
   monitorName_        	(parameters_.getUntrackedParameter<string>("MonitorName","YourSubsystemName")),
-  primaryVertexLabel_ 	(parameters_.getUntrackedParameter<InputTag>("PrimaryVertexLabel")),
+  primaryVertexLabel_ 	(consumes<VertexCollection>(
+      parameters_.getUntrackedParameter<InputTag>("PrimaryVertexLabel"))),
+  trackLabel_         	(consumes<reco::TrackCollection>(
+      parameters_.getUntrackedParameter<InputTag>("TrackLabel"))),
+  scalerLabel_        	(consumes<BeamSpot>(
+      parameters_.getUntrackedParameter<InputTag>("ScalerLabel"))),
   beamSpotLabel_      	(parameters_.getUntrackedParameter<InputTag>("BeamSpotLabel")),
-  trackLabel_         	(parameters_.getUntrackedParameter<InputTag>("TrackLabel")),
-  scalerLabel_        	(parameters_.getUntrackedParameter<InputTag>("ScalerLabel")),
   numberOfValuesToSave_ (0)
 {
   dbe_ = Service<DQMStore>().operator->();
-  
+
   if (monitorName_ != "" ) monitorName_ = monitorName_+"/" ;
-  
-  theBeamFitter_ = new BeamFitter(parameters_);
+
+  theBeamFitter_ = new BeamFitter(parameters_, consumesCollector() );
   theBeamFitter_->resetTrkVector();
   theBeamFitter_->resetLSRange();
   theBeamFitter_->resetRefTime();
   theBeamFitter_->resetPVFitter();
 
-  thePVFitter_ = new PVFitter(parameters_);
+  thePVFitter_ = new PVFitter(parameters_, consumesCollector());
 
 
   varNamesV_.push_back("x");
@@ -275,7 +279,7 @@ void AlcaBeamMonitor::analyze(const Event& iEvent, const EventSetup& iSetup ){
   if(beamSpotsMap_.find("DB") != beamSpotsMap_.end()){
     //------ Tracks
     Handle<reco::TrackCollection> TrackCollection;
-    iEvent.getByLabel(trackLabel_, TrackCollection);
+    iEvent.getByToken(trackLabel_, TrackCollection);
     const reco::TrackCollection *tracks = TrackCollection.product();
     for ( reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track ) {    
       hD0Phi0_->Fill(track->phi(), -1*track->dxy(beamSpotsMap_["DB"].position()));
@@ -285,15 +289,15 @@ void AlcaBeamMonitor::analyze(const Event& iEvent, const EventSetup& iSetup ){
 
   //------ Primary Vertices
   Handle<VertexCollection > PVCollection;
-  if (iEvent.getByLabel(primaryVertexLabel_, PVCollection )) {
+  if (iEvent.getByToken(primaryVertexLabel_, PVCollection )) {
     vertices_.push_back(*PVCollection.product());
   }
 
   if(beamSpotsMap_.find("SC") == beamSpotsMap_.end()){
     //BeamSpot from file for this stream is = to the scalar BeamSpot
     Handle<BeamSpot> recoBeamSpotHandle;
     try{
-      iEvent.getByLabel(scalerLabel_,recoBeamSpotHandle);
+      iEvent.getByToken(scalerLabel_,recoBeamSpotHandle);
     }
     catch( cms::Exception& exception ){ 			      
       LogInfo("AlcaBeamMonitor") 
@@ -562,3 +566,8 @@ void AlcaBeamMonitor::endJob(const LuminosityBlock& iLumi, const EventSetup& iSe
 
 
 DEFINE_FWK_MODULE(AlcaBeamMonitor);
+
+// Local Variables:
+// show-trailing-whitespace: t
+// truncate-lines: t
+// End:

DQM/BeamMonitor/plugins/AlcaBeamMonitor.h

@@ -52,10 +52,10 @@ class AlcaBeamMonitor : public edm::EDAnalyzer {
   //Parameters
   edm::ParameterSet parameters_;
   std::string       monitorName_;
-  edm::InputTag     primaryVertexLabel_;
+  edm::EDGetTokenT<reco::VertexCollection> primaryVertexLabel_;
+  edm::EDGetTokenT<reco::TrackCollection>  trackLabel_;
+  edm::EDGetTokenT<reco::BeamSpot>         scalerLabel_;
   edm::InputTag     beamSpotLabel_;
-  edm::InputTag     trackLabel_;
-  edm::InputTag     scalerLabel_;
 
   //Service variables
   int         numberOfValuesToSave_;
@@ -80,3 +80,8 @@ class AlcaBeamMonitor : public edm::EDAnalyzer {
 
 #endif
 
+
+// Local Variables:
+// show-trailing-whitespace: t
+// truncate-lines: t
+// End:

DQM/BeamMonitor/plugins/BeamMonitor.cc

@@ -20,20 +20,15 @@ V00-03-25
 #include "DQM/BeamMonitor/plugins/BeamMonitor.h"
 #include "DQMServices/Core/interface/QReport.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidate.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/Common/interface/View.h"
 #include "RecoVertex/BeamSpotProducer/interface/BSFitter.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include <numeric>
@@ -77,9 +72,15 @@ BeamMonitor::BeamMonitor( const ParameterSet& ps ) :
 
   parameters_     = ps;
   monitorName_    = parameters_.getUntrackedParameter<string>("monitorName","YourSubsystemName");
-  bsSrc_          = parameters_.getUntrackedParameter<InputTag>("beamSpot");
-  pvSrc_          = parameters_.getUntrackedParameter<InputTag>("primaryVertex");
-  hltSrc_         = parameters_.getParameter<InputTag>("hltResults");
+  bsSrc_          = consumes<reco::BeamSpot>(
+      parameters_.getUntrackedParameter<InputTag>("beamSpot"));
+  tracksLabel_    = consumes<reco::TrackCollection>(
+      parameters_.getParameter<ParameterSet>("BeamFitter")
+      .getUntrackedParameter<InputTag>("TrackCollection"));
+  pvSrc_          = consumes<reco::VertexCollection>(
+      parameters_.getUntrackedParameter<InputTag>("primaryVertex"));
+  hltSrc_         = consumes<TriggerResults>(
+      parameters_.getParameter<InputTag>("hltResults"));
   intervalInSec_  = parameters_.getUntrackedParameter<int>("timeInterval",920);//40 LS X 23"
   fitNLumi_       = parameters_.getUntrackedParameter<int>("fitEveryNLumi",-1);
   resetFitNLumi_  = parameters_.getUntrackedParameter<int>("resetEveryNLumi",-1);
@@ -89,7 +90,6 @@ BeamMonitor::BeamMonitor( const ParameterSet& ps ) :
   debug_          = parameters_.getUntrackedParameter<bool>("Debug");
   onlineMode_     = parameters_.getUntrackedParameter<bool>("OnlineMode");
   jetTrigger_     = parameters_.getUntrackedParameter<std::vector<std::string> >("jetTrigger");
-  tracksLabel_    = parameters_.getParameter<ParameterSet>("BeamFitter").getUntrackedParameter<InputTag>("TrackCollection");
   min_Ntrks_      = parameters_.getParameter<ParameterSet>("BeamFitter").getUntrackedParameter<int>("MinimumInputTracks");
   maxZ_           = parameters_.getParameter<ParameterSet>("BeamFitter").getUntrackedParameter<double>("MaximumZ");
   minNrVertices_  = parameters_.getParameter<ParameterSet>("PVFitter").getUntrackedParameter<unsigned int>("minNrVerticesForFit");
@@ -100,7 +100,7 @@ BeamMonitor::BeamMonitor( const ParameterSet& ps ) :
 
   if (monitorName_ != "" ) monitorName_ = monitorName_+"/" ;
 
-  theBeamFitter = new BeamFitter(parameters_);
+  theBeamFitter = new BeamFitter(parameters_, consumesCollector());
   theBeamFitter->resetTrkVector();
   theBeamFitter->resetLSRange();
   theBeamFitter->resetRefTime();
@@ -555,7 +555,7 @@ void BeamMonitor::analyze(const Event& iEvent,
   theBeamFitter->readEvent(iEvent); //Remember when track fitter read the event in the same place the PVFitter read the events !!!!!!!!!
 
   Handle<reco::BeamSpot> recoBeamSpotHandle;
-  iEvent.getByLabel(bsSrc_,recoBeamSpotHandle);
+  iEvent.getByToken(bsSrc_,recoBeamSpotHandle);
   refBS = *recoBeamSpotHandle;
 
   dbe_->setCurrentFolder(monitorName_+"Fit/");
@@ -577,7 +577,7 @@ void BeamMonitor::analyze(const Event& iEvent,
 
   //----Reco tracks -------------------------------------
   Handle<reco::TrackCollection> TrackCollection;
-  iEvent.getByLabel(tracksLabel_, TrackCollection);
+  iEvent.getByToken(tracksLabel_, TrackCollection);
   const reco::TrackCollection *tracks = TrackCollection.product();
   for ( reco::TrackCollection::const_iterator track = tracks->begin();
       track != tracks->end(); ++track ) {
@@ -588,7 +588,7 @@ void BeamMonitor::analyze(const Event& iEvent,
    //-------HLT Trigger --------------------------------
    edm::Handle<TriggerResults> triggerResults;
    bool JetTrigPass= false;
-  if(iEvent.getByLabel(hltSrc_, triggerResults)){
+  if(iEvent.getByToken(hltSrc_, triggerResults)){
      const edm::TriggerNames & trigNames = iEvent.triggerNames(*triggerResults); 
       for (unsigned int i=0; i< triggerResults->size(); i++){
            std::string trigName = trigNames.triggerName(i);
@@ -613,7 +613,7 @@ void BeamMonitor::analyze(const Event& iEvent,
   //------ Primary Vertices-------
   edm::Handle< reco::VertexCollection > PVCollection;
 
-  if (iEvent.getByLabel(pvSrc_, PVCollection )) {
+  if (iEvent.getByToken(pvSrc_, PVCollection )) {
     int nPVcount = 0;
     int nPVcount_ST =0;   //For Single Trigger(hence ST)
 
@@ -1403,3 +1403,8 @@ bool BeamMonitor::testScroll(time_t & tmpTime_, time_t & refTime_){
 }
 
 DEFINE_FWK_MODULE(BeamMonitor);
+
+// Local Variables:
+// show-trailing-whitespace: t
+// truncate-lines: t
+// End:

DQM/BeamMonitor/plugins/BeamMonitor.h

@@ -14,13 +14,18 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
+#include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/Common/interface/TriggerResults.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "RecoVertex/BeamSpotProducer/interface/BSTrkParameters.h"
 #include "RecoVertex/BeamSpotProducer/interface/BeamFitter.h"
 #include <fstream>
 
-
 //
 // class declaration
 //
@@ -60,10 +65,10 @@ class BeamMonitor : public edm::EDAnalyzer {
     const char * formatFitTime( const std::time_t &);
     edm::ParameterSet parameters_;
     std::string monitorName_;
-    edm::InputTag bsSrc_; // beam spot
-    edm::InputTag tracksLabel_;
-    edm::InputTag pvSrc_; // primary vertex
-    edm::InputTag hltSrc_;//hlt collection
+    edm::EDGetTokenT<reco::BeamSpot> bsSrc_; // beam spot
+    edm::EDGetTokenT<reco::TrackCollection> tracksLabel_;
+    edm::EDGetTokenT<reco::VertexCollection> pvSrc_; // primary vertex
+    edm::EDGetTokenT<edm::TriggerResults> hltSrc_;//hlt collection
 
     int fitNLumi_;
     int fitPVNLumi_;
@@ -170,3 +175,8 @@ class BeamMonitor : public edm::EDAnalyzer {
 
 #endif
 
+
+// Local Variables:
+// show-trailing-whitespace: t
+// truncate-lines: t
+// End:

DQM/BeamMonitor/plugins/BeamMonitorBx.cc

@@ -13,6 +13,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <numeric>
 #include <math.h>
@@ -57,7 +58,7 @@ BeamMonitorBx::BeamMonitorBx( const ParameterSet& ps ) :
 
   if (monitorName_ != "" ) monitorName_ = monitorName_+"/" ;
 
-  theBeamFitter = new BeamFitter(parameters_);
+  theBeamFitter = new BeamFitter(parameters_, consumesCollector());
   theBeamFitter->resetTrkVector();
   theBeamFitter->resetLSRange();
   theBeamFitter->resetRefTime();

DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.cc

@@ -15,8 +15,6 @@
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidate.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/Common/interface/View.h"
 #include "RecoVertex/BeamSpotProducer/interface/BSFitter.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -27,11 +25,9 @@
 #include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 
-#include "RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h"                                                                             
+#include "RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h"
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
-#include "DataFormats/Scalers/interface/BeamSpotOnline.h"
 #include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
-#include "DataFormats/Scalers/interface/DcsStatus.h"
 #include "DQMServices/Core/interface/QReport.h"
 
 #include <numeric>
@@ -54,9 +50,13 @@ BeamSpotProblemMonitor::BeamSpotProblemMonitor( const ParameterSet& ps ) :
 
   parameters_     = ps;
   monitorName_    = parameters_.getUntrackedParameter<string>("monitorName","YourSubsystemName");
-  trkSrc_         = parameters_.getUntrackedParameter<InputTag>("pixelTracks");
   nCosmicTrk_     = parameters_.getUntrackedParameter<int>("nCosmicTrk");
-  scalertag_      = parameters_.getUntrackedParameter<InputTag>("scalarBSCollection");
+  dcsStatus_      = consumes<DcsStatusCollection>(
+      parameters_.getUntrackedParameter<InputTag>("DCSStatus"));
+  scalertag_      = consumes<BeamSpotOnlineCollection>(
+      parameters_.getUntrackedParameter<InputTag>("scalarBSCollection"));
+  trkSrc_         = consumes<reco::TrackCollection>(
+      parameters_.getUntrackedParameter<InputTag>("pixelTracks"));
   intervalInSec_  = parameters_.getUntrackedParameter<int>("timeInterval",920);//40 LS X 23"
   debug_          = parameters_.getUntrackedParameter<bool>("Debug");
   onlineMode_     = parameters_.getUntrackedParameter<bool>("OnlineMode");
@@ -194,7 +194,7 @@ void BeamSpotProblemMonitor::analyze(const Event& iEvent,
 
     // Checking TK status
     Handle<DcsStatusCollection> dcsStatus;
-    iEvent.getByLabel("scalersRawToDigi", dcsStatus);
+    iEvent.getByToken(dcsStatus_, dcsStatus);
     for (int i=0;i<6;i++) dcsTk[i]=true;
     for (DcsStatusCollection::const_iterator dcsStatusItr = dcsStatus->begin(); 
          dcsStatusItr != dcsStatus->end(); ++dcsStatusItr) {
@@ -218,7 +218,7 @@ void BeamSpotProblemMonitor::analyze(const Event& iEvent,
 
      //If tracker is ON and collision is going on then must be few track ther
      edm::Handle<reco::TrackCollection> TrackCollection;
-     iEvent.getByLabel(trkSrc_, TrackCollection);
+     iEvent.getByToken(trkSrc_, TrackCollection);
      const reco::TrackCollection *tracks = TrackCollection.product();
      for ( reco::TrackCollection::const_iterator track = tracks->begin();track != tracks->end();++track ) 
       {
@@ -230,7 +230,7 @@ void BeamSpotProblemMonitor::analyze(const Event& iEvent,
 
   // get scalar collection and BeamSpot
   Handle<BeamSpotOnlineCollection> handleScaler;
-  iEvent.getByLabel( scalertag_, handleScaler);
+  iEvent.getByToken( scalertag_, handleScaler);
 
    // beam spot scalar object
    BeamSpotOnline spotOnline;
@@ -369,3 +369,8 @@ void BeamSpotProblemMonitor::endJob(const LuminosityBlock& lumiSeg,
 }
 
 DEFINE_FWK_MODULE(BeamSpotProblemMonitor);
+
+// Local Variables:
+// show-trailing-whitespace: t
+// truncate-lines: t
+// End:

DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.h

@@ -14,6 +14,10 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Scalers/interface/BeamSpotOnline.h"
+#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "RecoVertex/BeamSpotProducer/interface/BSTrkParameters.h"
@@ -57,8 +61,9 @@ class BeamSpotProblemMonitor : public edm::EDAnalyzer {
     void FillPlots(const edm::LuminosityBlock& lumiSeg,int&,int&,int&);
     edm::ParameterSet parameters_;
     std::string monitorName_;
-    edm::InputTag scalertag_; // scalar colleciton
-    edm::InputTag trkSrc_; //  track collection
+    edm::EDGetTokenT<DcsStatusCollection> dcsStatus_; // dcs status colleciton
+    edm::EDGetTokenT<BeamSpotOnlineCollection> scalertag_; // scalar colleciton
+    edm::EDGetTokenT<reco::TrackCollection> trkSrc_; //  track collection
 
     int Ntracks_;
     int nCosmicTrk_;
@@ -91,3 +96,8 @@ class BeamSpotProblemMonitor : public edm::EDAnalyzer {
 
 #endif
 
+
+// Local Variables:
+// show-trailing-whitespace: t
+// truncate-lines: t
+// End: