Consumes migration

RecoJets/JetAssociationProducers/src/JetExtender.cc

@@ -8,10 +8,7 @@
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/View.h"
-#include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/JetReco/interface/JetExtendedAssociation.h"
-#include "DataFormats/JetReco/interface/JetTracksAssociation.h"
 
 #include "JetExtender.h"
 
@@ -20,6 +17,10 @@ JetExtender::JetExtender(const edm::ParameterSet& fConfig)
     mJet2TracksAtVX (fConfig.getParameter<edm::InputTag> ("jet2TracksAtVX")),
     mJet2TracksAtCALO (fConfig.getParameter<edm::InputTag> ("jet2TracksAtCALO"))
 {
+  token_mJets = consumes<edm::View <reco::Jet> >(mJets);
+  if (!(mJet2TracksAtVX.label().empty())) token_mJet2TracksAtVX = consumes<reco::JetTracksAssociation::Container> (mJet2TracksAtVX);
+  if (!(mJet2TracksAtCALO.label().empty())) token_mJet2TracksAtCALO = consumes<reco::JetTracksAssociation::Container> (mJet2TracksAtCALO);
+
   produces<reco::JetExtendedAssociation::Container> ();
 }
 
@@ -28,11 +29,11 @@ JetExtender::~JetExtender() {}
 void JetExtender::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
   // get stuff from Event
   edm::Handle <edm::View <reco::Jet> > jets_h;
-  fEvent.getByLabel (mJets, jets_h);
+  fEvent.getByToken (token_mJets, jets_h);
   edm::Handle <reco::JetTracksAssociation::Container> j2tVX_h;
-  if (!(mJet2TracksAtVX.label().empty())) fEvent.getByLabel (mJet2TracksAtVX, j2tVX_h);
+  if (!(mJet2TracksAtVX.label().empty())) fEvent.getByToken (token_mJet2TracksAtVX, j2tVX_h);
   edm::Handle <reco::JetTracksAssociation::Container> j2tCALO_h;
-  if (!(mJet2TracksAtCALO.label().empty())) fEvent.getByLabel (mJet2TracksAtCALO, j2tCALO_h);
+  if (!(mJet2TracksAtCALO.label().empty())) fEvent.getByToken (token_mJet2TracksAtCALO, j2tCALO_h);
 
   std::auto_ptr<reco::JetExtendedAssociation::Container> 
     jetExtender (new reco::JetExtendedAssociation::Container (reco::JetRefBaseProd(jets_h)));

RecoJets/JetAssociationProducers/src/JetExtender.h

@@ -12,6 +12,9 @@
 #include "DataFormats/Common/interface/EDProductfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Common/interface/View.h"
+#include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/JetReco/interface/JetTracksAssociation.h"
 
 class JetExtender : public edm::EDProducer {
    public:
@@ -21,6 +24,9 @@ class JetExtender : public edm::EDProducer {
       virtual void produce(edm::Event&, const edm::EventSetup&);
 
    private:
+     edm::EDGetTokenT<edm::View <reco::Jet>> token_mJets;
+     edm::EDGetTokenT<reco::JetTracksAssociation::Container > token_mJet2TracksAtVX;
+     edm::EDGetTokenT<reco::JetTracksAssociation::Container > token_mJet2TracksAtCALO;
      edm::InputTag mJets;
      edm::InputTag mJet2TracksAtVX;
      edm::InputTag mJet2TracksAtCALO;

RecoJets/JetAssociationProducers/src/JetSignalVertexCompatibility.cc

@@ -25,10 +25,10 @@ using namespace reco;
 JetSignalVertexCompatibility::JetSignalVertexCompatibility(
 					const edm::ParameterSet &params) :
 	algo(params.getParameter<double>("cut"),
-	     params.getParameter<double>("temperature")),
-	jetTracksAssocLabel(params.getParameter<edm::InputTag>("jetTracksAssoc")),
-	primaryVerticesLabel(params.getParameter<edm::InputTag>("primaryVertices"))
+	     params.getParameter<double>("temperature"))
 {
+	jetTracksAssocToken = consumes<JetTracksAssociationCollection>(params.getParameter<edm::InputTag>("jetTracksAssoc"));
+	primaryVerticesToken = consumes<VertexCollection>(params.getParameter<edm::InputTag>("primaryVertices"));
 	produces<JetFloatAssociation::Container>();
 }
 
@@ -46,10 +46,10 @@ void JetSignalVertexCompatibility::produce(edm::Event &event,
 	algo.resetEvent(trackBuilder.product());
 
 	edm::Handle<JetTracksAssociationCollection> jetTracksAssoc;
-	event.getByLabel(jetTracksAssocLabel, jetTracksAssoc);
+	event.getByToken(jetTracksAssocToken, jetTracksAssoc);
 
 	edm::Handle<VertexCollection> primaryVertices;
-	event.getByLabel(primaryVerticesLabel, primaryVertices);
+	event.getByToken(primaryVerticesToken, primaryVertices);
 
 	std::auto_ptr<JetFloatAssociation::Container> result(
 		new JetFloatAssociation::Container(jetTracksAssoc->keyProduct()));

RecoJets/JetAssociationProducers/src/JetSignalVertexCompatibility.h

@@ -8,6 +8,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "RecoJets/JetAssociationAlgorithms/interface/JetSignalVertexCompatibilityAlgo.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 
 class JetSignalVertexCompatibility : public edm::EDProducer {
     public:
@@ -19,8 +20,9 @@ class JetSignalVertexCompatibility : public edm::EDProducer {
     private:
 	reco::JetSignalVertexCompatibilityAlgo	algo;
 
-	const edm::InputTag			jetTracksAssocLabel;
-	const edm::InputTag			primaryVerticesLabel;
+	edm::EDGetTokenT<reco::JetTracksAssociationCollection> jetTracksAssocToken;
+	edm::EDGetTokenT<reco::VertexCollection> primaryVerticesToken;
+
 };
 
 #endif // JetSignalVertexCompatibility_h

RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtCaloFace.cc

@@ -10,22 +10,21 @@
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" 
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/View.h"
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/JetReco/interface/JetTracksAssociation.h"
 
 
 
 #include "JetTracksAssociatorAtCaloFace.h"
 
 JetTracksAssociatorAtCaloFace::JetTracksAssociatorAtCaloFace(const edm::ParameterSet& fConfig)
-  : mJets (fConfig.getParameter<edm::InputTag> ("jets")),
-    mExtrapolations (fConfig.getParameter<edm::InputTag> ("extrapolations")),
-    firstRun(true),
+  : firstRun(true),
     dR_(fConfig.getParameter<double>("coneSize"))
 {
+  mJets = consumes<edm::View <reco::Jet> >(fConfig.getParameter<edm::InputTag> ("jets"));
+  mExtrapolations  = consumes<std::vector<reco::TrackExtrapolation> >(fConfig.getParameter<edm::InputTag> ("extrapolations")),
+
   produces<reco::JetTracksAssociation::Container> ();
 }
 
@@ -44,9 +43,9 @@ void JetTracksAssociatorAtCaloFace::produce(edm::Event& fEvent, const edm::Event
 
   // get stuff from Event
   edm::Handle <edm::View <reco::Jet> > jets_h;
-  fEvent.getByLabel (mJets, jets_h);
+  fEvent.getByToken (mJets, jets_h);
   edm::Handle <std::vector<reco::TrackExtrapolation> > extrapolations_h;
-  fEvent.getByLabel (mExtrapolations, extrapolations_h);
+  fEvent.getByToken (mExtrapolations, extrapolations_h);
 
   // Check to make sure we have inputs
   if ( jets_h->size() == 0 ) return;

RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtCaloFace.h

@@ -15,6 +15,8 @@
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "DataFormats/Common/interface/View.h"
+#include "DataFormats/JetReco/interface/JetTracksAssociation.h"
 
 class JetTracksAssociatorAtCaloFace : public edm::EDProducer {
    public:
@@ -27,8 +29,8 @@ class JetTracksAssociatorAtCaloFace : public edm::EDProducer {
 
      JetTracksAssociatorAtCaloFace(){}
 
-     edm::InputTag mJets;
-     edm::InputTag mExtrapolations;
+     edm::EDGetTokenT<edm::View <reco::Jet>> mJets;
+     edm::EDGetTokenT<std::vector<reco::TrackExtrapolation> > mExtrapolations;
      JetTracksAssociationXtrpCalo mAssociator;
      edm::ESHandle<CaloGeometry> pGeo;
      bool firstRun;

RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtVertex.cc

@@ -16,16 +16,15 @@
 #include "JetTracksAssociatorAtVertex.h"
 
 JetTracksAssociatorAtVertex::JetTracksAssociatorAtVertex(const edm::ParameterSet& fConfig)
-  : mJets (fConfig.getParameter<edm::InputTag> ("jets")),
-    mTracks (fConfig.getParameter<edm::InputTag> ("tracks")),
-    mAssociator (fConfig.getParameter<double> ("coneSize")),
+  : mAssociator (fConfig.getParameter<double> ("coneSize")),
     mAssociatorAssigned (fConfig.getParameter<double> ("coneSize")),
     useAssigned(false), pvSrc()
 {
-
+  mJets = consumes<edm::View <reco::Jet> >(fConfig.getParameter<edm::InputTag> ("jets"));
+  mTracks = consumes<reco::TrackCollection>(fConfig.getParameter<edm::InputTag>("tracks"));
   if ( fConfig.exists("useAssigned") ) {
     useAssigned = fConfig.getParameter<bool> ("useAssigned");
-    pvSrc = fConfig.getParameter<edm::InputTag> ("pvSrc");
+    pvSrc = consumes<reco::VertexCollection>(fConfig.getParameter<edm::InputTag> ("pvSrc"));
   }
 
   produces<reco::JetTracksAssociation::Container> ();
@@ -35,9 +34,9 @@ JetTracksAssociatorAtVertex::~JetTracksAssociatorAtVertex() {}
 
 void JetTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
   edm::Handle <edm::View <reco::Jet> > jets_h;
-  fEvent.getByLabel (mJets, jets_h);
+  fEvent.getByToken (mJets, jets_h);
   edm::Handle <reco::TrackCollection> tracks_h;
-  fEvent.getByLabel (mTracks, tracks_h);
+  fEvent.getByToken (mTracks, tracks_h);
 
   std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));
 
@@ -55,7 +54,7 @@ void JetTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSe
     mAssociator.produce (&*jetTracks, allJets, allTracks);
   } else {
     edm::Handle<reco::VertexCollection> pvHandle;
-    fEvent.getByLabel(pvSrc,pvHandle);
+    fEvent.getByToken(pvSrc,pvHandle);
     const reco::VertexCollection & vertices = *pvHandle.product();     
     mAssociatorAssigned.produce (&*jetTracks, allJets, allTracks,vertices);
   }

RecoJets/JetAssociationProducers/src/JetTracksAssociatorAtVertex.h

@@ -24,13 +24,14 @@ class JetTracksAssociatorAtVertex : public edm::EDProducer {
       virtual void produce(edm::Event&, const edm::EventSetup&);
 
    private:
-     edm::InputTag mJets;
-     edm::InputTag mTracks;
+     edm::EDGetTokenT<edm::View <reco::Jet>> mJets;
+     edm::EDGetTokenT<reco::TrackCollection> mTracks;
+
      int mTrackQuality;
      JetTracksAssociationDRVertex mAssociator;
      JetTracksAssociationDRVertexAssigned mAssociatorAssigned;
      bool useAssigned;   /// if true, use the track/jet association with vertex assignment to tracks
-     edm::InputTag pvSrc; /// if useAssigned, will read this PV collection. 
+     edm::EDGetTokenT<reco::VertexCollection> pvSrc; /// if useAssigned, will read this PV collection. 
 };
 
 #endif

RecoJets/JetAssociationProducers/src/JetTracksAssociatorExplicit.cc

@@ -16,10 +16,10 @@
 #include "JetTracksAssociatorExplicit.h"
 
 JetTracksAssociatorExplicit::JetTracksAssociatorExplicit(const edm::ParameterSet& fConfig)
-  : mJets (fConfig.getParameter<edm::InputTag> ("jets")),
-    mTracks (fConfig.getParameter<edm::InputTag> ("tracks")),
-    mAssociatorExplicit ()
+  : mAssociatorExplicit ()
 {
+  mJets = consumes<edm::View <reco::Jet> >(fConfig.getParameter<edm::InputTag> ("jets"));
+  mTracks = consumes<reco::TrackCollection>(fConfig.getParameter<edm::InputTag>("tracks"));
 
   produces<reco::JetTracksAssociation::Container> ();
 }
@@ -28,9 +28,9 @@ JetTracksAssociatorExplicit::~JetTracksAssociatorExplicit() {}
 
 void JetTracksAssociatorExplicit::produce(edm::Event& fEvent, const edm::EventSetup& fSetup) {
   edm::Handle <edm::View <reco::Jet> > jets_h;
-  fEvent.getByLabel (mJets, jets_h);
+  fEvent.getByToken (mJets, jets_h);
   edm::Handle <reco::TrackCollection> tracks_h;
-  fEvent.getByLabel (mTracks, tracks_h);
+  fEvent.getByToken (mTracks, tracks_h);
 
   std::auto_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));
 

RecoJets/JetAssociationProducers/src/JetTracksAssociatorExplicit.h

@@ -24,8 +24,8 @@ class JetTracksAssociatorExplicit : public edm::EDProducer {
       virtual void produce(edm::Event&, const edm::EventSetup&);
 
    private:
-     edm::InputTag mJets;
-     edm::InputTag mTracks;
+     edm::EDGetTokenT<edm::View <reco::Jet>> mJets;
+     edm::EDGetTokenT<reco::TrackCollection> mTracks;
      JetTracksAssociationExplicit mAssociatorExplicit;
 };
 

RecoJets/JetAssociationProducers/src/TrackExtrapolator.cc

@@ -8,9 +8,9 @@
 //
 // constructors and destructor
 //
-TrackExtrapolator::TrackExtrapolator(const edm::ParameterSet& iConfig) :
-  tracksSrc_(iConfig.getParameter<edm::InputTag> ("trackSrc"))
+TrackExtrapolator::TrackExtrapolator(const edm::ParameterSet& iConfig)
 {
+  tracksSrc_ = consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("trackSrc"));
   trackQuality_ = 
     reco::TrackBase::qualityByName (iConfig.getParameter<std::string> ("trackQuality"));
   if (trackQuality_ == reco::TrackBase::undefQuality) { // we have a problem
@@ -48,7 +48,7 @@ TrackExtrapolator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
   // get stuff from Event
   edm::Handle <reco::TrackCollection> tracks_h;
-  iEvent.getByLabel (tracksSrc_, tracks_h);
+  iEvent.getByToken (tracksSrc_, tracks_h);
 
   std::auto_ptr< std::vector<reco::TrackExtrapolation> > extrapolations( new std::vector<reco::TrackExtrapolation>() );
 

RecoJets/JetAssociationProducers/test/PileupJetAnalyzer.cc

@@ -44,8 +44,10 @@ class PileupJetAnalyzer : public edm::EDAnalyzer {
     private:
 	TNtuple			*ntuple;
 
-	const edm::InputTag	jetTracksAssocLabel;
-	const edm::InputTag	jetTagLabel;
+	edm::EDGetTokenT<JetTracksAssociationCollection>  jetTracksAssocToken;
+	edm::EDGetTokenT<JetFloatAssociation::Container>  jetTagToken;
+	edm::EDGetTokenT<edm::SimTrackContainer>  tokenSimTrack;
+	edm::EDGetTokenT<edm::SimVertexContainer> tokenSimVertex;
 	const double		signalFraction;
 	const double		jetMinE;
 	const double		jetMinEt;
@@ -54,14 +56,17 @@ class PileupJetAnalyzer : public edm::EDAnalyzer {
 };
 
 PileupJetAnalyzer::PileupJetAnalyzer(const edm::ParameterSet &params) :
-	jetTracksAssocLabel(params.getParameter<edm::InputTag>("jetTracksAssoc")),
-	jetTagLabel(params.getParameter<edm::InputTag>("jetTagLabel")),
 	signalFraction(params.getParameter<double>("signalFraction")),
 	jetMinE(params.getParameter<double>("jetMinE")),
 	jetMinEt(params.getParameter<double>("jetMinEt")),
 	jetMaxEta(params.getParameter<double>("jetMaxEta")),
 	trackPtLimit(params.getParameter<double>("trackPtLimit"))
 {
+	jetTracksAssocToken = consumes<JetTracksAssociationCollection>(params.getParameter<edm::InputTag>("jetTracksAssoc"));
+	jetTagToken = consumes<JetFloatAssociation::Container>(params.getParameter<edm::InputTag>("jetTagLabel"));
+	tokenSimTrack = consumes<edm::SimTrackContainer>(edm::InputTag("famosSimHits"));
+	tokenSimVertex = consumes<edm::SimVertexContainer>(edm::InputTag("famosSimHits"));
+
 	edm::Service<TFileService> fs;
 	ntuple = fs->make<TNtuple>("jets", "", "mc:tag:et:eta");
 }
@@ -74,16 +79,16 @@ void PileupJetAnalyzer::analyze(const edm::Event &event,
                               const edm::EventSetup &es)
 {
 	edm::Handle<JetTracksAssociationCollection> jetTracksAssoc;
-	event.getByLabel(jetTracksAssocLabel, jetTracksAssoc);
+	event.getByToken(jetTracksAssocToken, jetTracksAssoc);
 
 	edm::Handle<JetFloatAssociation::Container> jetTags;
-	event.getByLabel(jetTagLabel, jetTags);
+	event.getByToken(jetTagToken, jetTags);
 
 	edm::Handle<edm::SimTrackContainer> simTracks;
-	event.getByLabel("famosSimHits", simTracks);
+	event.getByToken(tokenSimTrack, simTracks);
 
 	edm::Handle<edm::SimVertexContainer> simVertices;
-	event.getByLabel("famosSimHits", simVertices);
+	event.getByToken(tokenSimVertex, simVertices);
 
 	// find vertices in all jets
 	for(JetTracksAssociationCollection::const_iterator iter =