Merge pull request #35300 from makortel/esconsumesRecoPixelVertexing

Migrate EDModules in RecoPixelVertexing/PixelTrackFitting to esConsumes
cms-sw · Sep 18, 2021 · aeb2739 · aeb2739
2 parents fc2c6b7 + f41bfc7
commit aeb2739
Show file tree

Hide file tree

Showing 27 changed files with 86 additions and 151 deletions.
diff --git a/FastSimulation/Tracking/plugins/PixelTracksProducer.cc b/FastSimulation/Tracking/plugins/PixelTracksProducer.cc
@@ -4,16 +4,12 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/OwnVector.h"
 
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
-
 //Pixel Specific stuff
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducerFactory.h"
@@ -32,7 +28,8 @@
 
 using namespace pixeltrackfitting;
 
-PixelTracksProducer::PixelTracksProducer(const edm::ParameterSet& conf) : theRegionProducer(nullptr) {
+PixelTracksProducer::PixelTracksProducer(const edm::ParameterSet& conf)
+    : theRegionProducer(nullptr), ttopoToken(esConsumes()) {
   produces<reco::TrackCollection>();
   produces<TrackingRecHitCollection>();
   produces<reco::TrackExtraCollection>();
@@ -62,9 +59,7 @@ void PixelTracksProducer::produce(edm::Event& e, const edm::EventSetup& es) {
   TracksWithRecHits pixeltracks;
   TracksWithRecHits cleanedTracks;
 
-  edm::ESHandle<TrackerTopology> httopo;
-  es.get<TrackerTopologyRcd>().get(httopo);
-  const TrackerTopology& ttopo = *httopo;
+  const TrackerTopology& ttopo = es.getData(ttopoToken);
 
   edm::Handle<PixelFitter> hfitter;
   e.getByToken(fitterToken, hfitter);
@@ -107,7 +102,7 @@ void PixelTracksProducer::produce(edm::Event& e, const edm::EventSetup& es) {
       }
 
       // fitting the triplet
-      std::unique_ptr<reco::Track> track = fitter.run(TripletHits, region, es);
+      std::unique_ptr<reco::Track> track = fitter.run(TripletHits, region);
 
       // decide if track should be skipped according to filter
       if (!theFilter(track.get(), TripletHits)) {

diff --git a/FastSimulation/Tracking/plugins/PixelTracksProducer.h b/FastSimulation/Tracking/plugins/PixelTracksProducer.h
@@ -1,23 +1,21 @@
 #ifndef FastSimulation_Tracking_PixelTracksProducer_H
 #define FastSimulation_Tracking_PixelTracksProducer_H
 
+#include "FWCore/Framework/interface/FrameworkfwdMostUsed.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
+
 #include <string>
 
 class PixelFitter;
 class PixelTrackFilter;
 class TrackingRegionProducer;
 
-namespace edm {
-  class ParameterSet;
-  class Event;
-  class EventSetup;
-}  // namespace edm
-
 class PixelTracksProducer : public edm::stream::EDProducer<> {
 public:
   explicit PixelTracksProducer(const edm::ParameterSet& conf);
@@ -32,5 +30,6 @@ class PixelTracksProducer : public edm::stream::EDProducer<> {
 
   edm::EDGetTokenT<TrajectorySeedCollection> seedProducerToken;
   edm::EDGetTokenT<PixelTrackFilter> filterToken;
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken;
 };
 #endif
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/TrackFitter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/TrackFitter.h
@@ -4,7 +4,6 @@
 #include "RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterBase.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -23,8 +22,7 @@ class TrackFitter : public PixelFitterBase {
   ~TrackFitter() override {}
 
   std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit*>& hits,
-                                   const TrackingRegion& region,
-                                   const edm::EventSetup& setup) const override;
+                                   const TrackingRegion& region) const override;
 
 private:
   float getCotThetaAndUpdateZip(

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc
@@ -39,8 +39,7 @@ namespace {
 
 /*****************************************************************************/
 std::unique_ptr<reco::Track> TrackFitter::run(const std::vector<const TrackingRecHit*>& hits,
-                                              const TrackingRegion& region,
-                                              const edm::EventSetup& setup) const {
+                                              const TrackingRegion& region) const {
   std::unique_ptr<reco::Track> ret;
 
   int nhits = hits.size();

diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/KFBasedPixelFitter.h b/RecoPixelVertexing/PixelTrackFitting/interface/KFBasedPixelFitter.h
@@ -7,9 +7,6 @@
 
 #include <vector>
 
-namespace edm {
-  class EventSetup;
-}
 namespace reco {
   class Track;
   class BeamSpot;
@@ -33,8 +30,7 @@ class KFBasedPixelFitter : public PixelFitterBase {
   ~KFBasedPixelFitter() override {}
 
   std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit *> &hits,
-                                   const TrackingRegion &region,
-                                   const edm::EventSetup &setup) const override;
+                                   const TrackingRegion &region) const override;
 
 private:
   //this two simple classes are copied from Alignment/ReferenceTrajectories in order to avoid dependencies

diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitter.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitter.h
@@ -12,10 +12,8 @@ class PixelFitter {
 
   void swap(PixelFitter& o) { std::swap(fitter_, o.fitter_); }
 
-  std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit*>& hits,
-                                   const TrackingRegion& region,
-                                   const edm::EventSetup& setup) const {
-    return fitter_->run(hits, region, setup);
+  std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit*>& hits, const TrackingRegion& region) const {
+    return fitter_->run(hits, region);
   }
 
 private:

diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterBase.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterBase.h
@@ -6,9 +6,6 @@
 #include <vector>
 #include <memory>
 
-namespace edm {
-  class EventSetup;
-}
 class TrackingRegion;
 class TrackingRecHit;
 
@@ -17,7 +14,6 @@ class PixelFitterBase {
   virtual ~PixelFitterBase() {}
 
   virtual std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit*>& hits,
-                                           const TrackingRegion& region,
-                                           const edm::EventSetup& setup) const = 0;
+                                           const TrackingRegion& region) const = 0;
 };
 #endif
diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterByConformalMappingAndLine.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterByConformalMappingAndLine.h
@@ -4,7 +4,6 @@
 #include "RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterBase.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 
 class TrackerGeometry;
@@ -20,8 +19,7 @@ class PixelFitterByConformalMappingAndLine : public PixelFitterBase {
                                                 bool useFixImpactParameter);
   ~PixelFitterByConformalMappingAndLine() override {}
   std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit *> &hits,
-                                   const TrackingRegion &region,
-                                   const edm::EventSetup &setup) const override;
+                                   const TrackingRegion &region) const override;
 
 private:
   const TransientTrackingRecHitBuilder *theTTRHBuilder;

diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterByHelixProjections.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterByHelixProjections.h
@@ -4,7 +4,6 @@
 #include "RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterBase.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -14,19 +13,18 @@ class TrackerTopology;
 
 class PixelFitterByHelixProjections final : public PixelFitterBase {
 public:
-  explicit PixelFitterByHelixProjections(const edm::EventSetup *es,
+  explicit PixelFitterByHelixProjections(const TrackerTopology *ttopo,
                                          const MagneticField *field,
                                          bool scaleErrorsForBPix1,
                                          float scaleFactor);
   ~PixelFitterByHelixProjections() override {}
   std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit *> &hits,
-                                   const TrackingRegion &region,
-                                   const edm::EventSetup &setup) const override;
+                                   const TrackingRegion &region) const override;
 
 private:
+  const TrackerTopology *theTopo;
   const MagneticField *theField;
   const bool thescaleErrorsForBPix1;
   const float thescaleFactor;
-  TrackerTopology const *theTopo = nullptr;
 };
 #endif
diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelNtupletsFitter.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelNtupletsFitter.h
@@ -5,7 +5,6 @@
 
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "RecoPixelVertexing/PixelTrackFitting/interface/PixelFitterBase.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
@@ -15,8 +14,7 @@ class PixelNtupletsFitter final : public PixelFitterBase {
   explicit PixelNtupletsFitter(float nominalB, const MagneticField* field, bool useRiemannFit);
   ~PixelNtupletsFitter() override = default;
   std::unique_ptr<reco::Track> run(const std::vector<const TrackingRecHit*>& hits,
-                                   const TrackingRegion& region,
-                                   const edm::EventSetup& setup) const override;
+                                   const TrackingRegion& region) const override;
 
 private:
   float nominalB_;

diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackReconstruction.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackReconstruction.h
@@ -1,26 +1,20 @@
 #ifndef RecoPixelVertexing_PixelTrackFitting_PixelTrackReconstruction_H
 #define RecoPixelVertexing_PixelTrackFitting_PixelTrackReconstruction_H
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/FrameworkfwdMostUsed.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "RecoPixelVertexing/PixelTrackFitting/interface/TracksWithHits.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackCleaner.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include <memory>
 
 class PixelFitter;
-class PixelTrackCleaner;
 class PixelTrackFilter;
 class RegionsSeedingHitSets;
 
-namespace edm {
-  class Event;
-  class EventSetup;
-  class Run;
-  class ParameterSetDescription;
-}  // namespace edm
-
 class PixelTrackReconstruction {
 public:
   PixelTrackReconstruction(const edm::ParameterSet& conf, edm::ConsumesCollector&& iC);
@@ -34,6 +28,6 @@ class PixelTrackReconstruction {
   edm::EDGetTokenT<RegionsSeedingHitSets> theHitSetsToken;
   edm::EDGetTokenT<PixelFitter> theFitterToken;
   edm::EDGetTokenT<PixelTrackFilter> theFilterToken;
-  std::string theCleanerName;
+  edm::ESGetToken<PixelTrackCleaner, PixelTrackCleaner::Record> theCleanerToken;
 };
 #endif
diff --git a/RecoPixelVertexing/PixelTrackFitting/plugins/KFBasedPixelFitterProducer.cc b/RecoPixelVertexing/PixelTrackFitting/plugins/KFBasedPixelFitterProducer.cc
@@ -4,7 +4,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
@@ -30,21 +29,25 @@ class KFBasedPixelFitterProducer : public edm::global::EDProducer<> {
 private:
   void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
 
-  std::string thePropagatorLabel;
-  std::string thePropagatorOppositeLabel;
-  std::string theTTRHBuilderName;
   edm::EDGetTokenT<reco::BeamSpot> theBeamSpotToken;
+  const edm::ESGetToken<TransientTrackingRecHitBuilder, TransientRecHitRecord> theTTRHBuilderToken;
+  const edm::ESGetToken<Propagator, TrackingComponentsRecord> thePropagatorToken;
+  const edm::ESGetToken<Propagator, TrackingComponentsRecord> thePropagatorOppositeToken;
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> theTrackerToken;
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> theFieldToken;
+  const edm::EDPutTokenT<PixelFitter> thePutToken;
 };
 
 KFBasedPixelFitterProducer::KFBasedPixelFitterProducer(const edm::ParameterSet& iConfig)
-    : thePropagatorLabel(iConfig.getParameter<std::string>("propagator")),
-      thePropagatorOppositeLabel(iConfig.getParameter<std::string>("propagator")),
-      theTTRHBuilderName(iConfig.getParameter<std::string>("TTRHBuilder")) {
+    : theTTRHBuilderToken(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("TTRHBuilder")))),
+      thePropagatorToken(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("propagator")))),
+      thePropagatorOppositeToken(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("propagator")))),
+      theTrackerToken(esConsumes()),
+      theFieldToken(esConsumes()),
+      thePutToken(produces()) {
   if (iConfig.getParameter<bool>("useBeamSpotConstraint")) {
     theBeamSpotToken = consumes<reco::BeamSpot>(iConfig.getParameter<edm::InputTag>("beamSpotConstraint"));
   }
-
-  produces<PixelFitter>();
 }
 
 void KFBasedPixelFitterProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
@@ -60,32 +63,20 @@ void KFBasedPixelFitterProducer::fillDescriptions(edm::ConfigurationDescriptions
 }
 
 void KFBasedPixelFitterProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
-  edm::ESHandle<TransientTrackingRecHitBuilder> ttrhb;
-  iSetup.get<TransientRecHitRecord>().get(theTTRHBuilderName, ttrhb);
-
-  edm::ESHandle<Propagator> propagator;
-  iSetup.get<TrackingComponentsRecord>().get(thePropagatorLabel, propagator);
-
-  edm::ESHandle<Propagator> opropagator;
-  iSetup.get<TrackingComponentsRecord>().get(thePropagatorOppositeLabel, opropagator);
-
-  edm::ESHandle<TrackerGeometry> tracker;
-  iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
-
-  edm::ESHandle<MagneticField> field;
-  iSetup.get<IdealMagneticFieldRecord>().get(field);
-
   const reco::BeamSpot* beamspot = nullptr;
   if (!theBeamSpotToken.isUninitialized()) {
     edm::Handle<reco::BeamSpot> hbs;
     iEvent.getByToken(theBeamSpotToken, hbs);
     beamspot = hbs.product();
   }
 
-  auto impl = std::make_unique<KFBasedPixelFitter>(
-      propagator.product(), opropagator.product(), ttrhb.product(), tracker.product(), field.product(), beamspot);
-  auto prod = std::make_unique<PixelFitter>(std::move(impl));
-  iEvent.put(std::move(prod));
+  iEvent.emplace(thePutToken,
+                 std::make_unique<KFBasedPixelFitter>(&iSetup.getData(thePropagatorToken),
+                                                      &iSetup.getData(thePropagatorOppositeToken),
+                                                      &iSetup.getData(theTTRHBuilderToken),
+                                                      &iSetup.getData(theTrackerToken),
+                                                      &iSetup.getData(theFieldToken),
+                                                      beamspot));
 }
 
 DEFINE_FWK_MODULE(KFBasedPixelFitterProducer);