Merge pull request #34935 from makortel/esconsumesRecoTauTag

Migrate PFTauPrimaryVertexProducerBase to esConsumes()
cms-sw · Aug 21, 2021 · 85ec07f · 85ec07f
2 parents 86bd3d5 + 385517c
commit 85ec07f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/RecoTauTag/RecoTau/interface/PFTauPrimaryVertexProducerBase.h b/RecoTauTag/RecoTau/interface/PFTauPrimaryVertexProducerBase.h
@@ -30,6 +30,9 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
+#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
+#include "TrackingTools/Records/interface/TransientTrackRecord.h"
+
 #include "DataFormats/TauReco/interface/PFTauDiscriminator.h"
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 #include "RecoTauTag/RecoTau/interface/RecoTauVertexAssociator.h"
@@ -72,6 +75,7 @@ class PFTauPrimaryVertexProducerBase : public edm::stream::EDProducer<> {
   edm::EDGetTokenT<edm::View<reco::Muon> > muonToken_;
   edm::EDGetTokenT<reco::VertexCollection> pvToken_;
   edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
+  edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> transTrackBuilderToken_;
   int algorithm_;
   edm::ParameterSet qualityCutsPSet_;
   bool useBeamSpot_;

diff --git a/RecoTauTag/RecoTau/src/PFTauPrimaryVertexProducerBase.cc b/RecoTauTag/RecoTau/src/PFTauPrimaryVertexProducerBase.cc
@@ -1,11 +1,8 @@
 #include "RecoTauTag/RecoTau/interface/PFTauPrimaryVertexProducerBase.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
-#include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "RecoVertex/VertexPrimitives/interface/TransientVertex.h"
 #include "RecoVertex/AdaptiveVertexFit/interface/AdaptiveVertexFitter.h"
 
@@ -23,6 +20,7 @@ PFTauPrimaryVertexProducerBase::PFTauPrimaryVertexProducerBase(const edm::Parame
       muonToken_(consumes<edm::View<reco::Muon>>(iConfig.getParameter<edm::InputTag>("MuonTag"))),
       pvToken_(consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("PVTag"))),
       beamSpotToken_(consumes<reco::BeamSpot>(iConfig.getParameter<edm::InputTag>("beamSpot"))),
+      transTrackBuilderToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))),
       algorithm_(iConfig.getParameter<int>("Algorithm")),
       qualityCutsPSet_(iConfig.getParameter<edm::ParameterSet>("qualityCuts")),
       useBeamSpot_(iConfig.getParameter<bool>("useBeamSpot")),
@@ -79,8 +77,7 @@ void PFTauPrimaryVertexProducerBase::produce(edm::Event& iEvent, const edm::Even
   beginEvent(iEvent, iSetup);
 
   // Obtain Collections
-  edm::ESHandle<TransientTrackBuilder> transTrackBuilder;
-  iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", transTrackBuilder);
+  auto const& transTrackBuilder = iSetup.getData(transTrackBuilderToken_);
 
   edm::Handle<std::vector<reco::PFTau>> pfTaus;
   iEvent.getByToken(pftauToken_, pfTaus);
@@ -193,7 +190,7 @@ void PFTauPrimaryVertexProducerBase::produce(edm::Event& iEvent, const edm::Even
         std::vector<reco::TransientTrack> transTracks;
         transTracks.reserve(nonTauTracks.size());
         for (const auto track : nonTauTracks) {
-          transTracks.push_back(transTrackBuilder->build(*track));
+          transTracks.push_back(transTrackBuilder.build(*track));
         }
         bool fitOK(true);
         if (transTracks.size() >= 2) {