Migrate rest of {Cosmic,GlobalCosmic,Global,L2,L3,Standalone}MuonProduer to EventSetup consumes

RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.cc

@@ -23,7 +23,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/TrackReco/interface/Track.h"
@@ -59,7 +58,8 @@ CosmicMuonProducer::CosmicMuonProducer(const ParameterSet& iConfig) {
   theService = std::make_unique<MuonServiceProxy>(serviceParameters, consumesCollector());
   theTrackFinder =
       std::make_unique<MuonTrackFinder>(std::make_unique<CosmicMuonTrajectoryBuilder>(tbpar, theService.get(), iC),
-                                        std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService.get()));
+                                        std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService.get()),
+                                        iC);
 
   produces<reco::TrackCollection>();
   produces<TrackingRecHitCollection>();

RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.cc

@@ -21,7 +21,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/MuonReco/interface/MuonTrackLinks.h"
@@ -51,7 +50,8 @@ GlobalCosmicMuonProducer::GlobalCosmicMuonProducer(const edm::ParameterSet& iCon
   edm::ConsumesCollector iC = consumesCollector();
   theTrackFinder = std::make_unique<MuonTrackFinder>(
       std::make_unique<GlobalCosmicMuonTrajectoryBuilder>(tbpar, theService.get(), iC),
-      std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService.get()));
+      std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService.get()),
+      iC);
 
   produces<reco::TrackCollection>();
   produces<TrackingRecHitCollection>();

RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.cc

@@ -64,7 +64,7 @@ GlobalMuonProducer::GlobalMuonProducer(const ParameterSet& parameterSet) {
   auto mtl = std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService);
   auto gmtb = std::make_unique<GlobalMuonTrajectoryBuilder>(trajectoryBuilderParameters, theService, iC);
 
-  theTrackFinder = new MuonTrackFinder(std::move(gmtb), std::move(mtl));
+  theTrackFinder = std::make_unique<MuonTrackFinder>(std::move(gmtb), std::move(mtl), iC);
 
   setAlias(parameterSet.getParameter<std::string>("@module_label"));
   produces<reco::TrackCollection>().setBranchAlias(theAlias + "Tracks");
@@ -82,8 +82,6 @@ GlobalMuonProducer::~GlobalMuonProducer() {
   LogTrace("Muon|RecoMuon|GlobalMuonProducer") << "destructor called" << endl;
   if (theService)
     delete theService;
-  if (theTrackFinder)
-    delete theTrackFinder;
 }
 
 //

RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.h

@@ -52,7 +52,7 @@ class GlobalMuonProducer : public edm::stream::EDProducer<> {
   edm::EDGetTokenT<TrajTrackAssociationCollection> staAssoMapToken;
   edm::EDGetTokenT<reco::TrackToTrackMap> updatedStaAssoMapToken;
 
-  MuonTrackFinder* theTrackFinder;
+  std::unique_ptr<MuonTrackFinder> theTrackFinder;
 
   /// the event setup proxy, it takes care the services update
   MuonServiceProxy* theService;

RecoMuon/L2MuonProducer/src/L2MuonProducer.cc

@@ -88,7 +88,8 @@ L2MuonProducer::L2MuonProducer(const ParameterSet& parameterSet) {
   theTrackFinder =
       std::make_unique<MuonTrackFinder>(std::move(trajectoryBuilder),
                                         std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService.get()),
-                                        std::make_unique<MuonTrajectoryCleaner>(true));
+                                        std::make_unique<MuonTrajectoryCleaner>(true),
+                                        iC);
 
   produces<reco::TrackCollection>();
   produces<reco::TrackCollection>("UpdatedAtVtx");

RecoMuon/L3MuonProducer/src/L3MuonProducer.cc

@@ -58,7 +58,7 @@ L3MuonProducer::L3MuonProducer(const ParameterSet& parameterSet) {
   // instantiate the concrete trajectory builder in the Track Finder
   auto mtl = std::make_unique<MuonTrackLoader>(trackLoaderParameters, iC, theService.get());
   auto l3mtb = std::make_unique<L3MuonTrajectoryBuilder>(trajectoryBuilderParameters, theService.get(), iC);
-  theTrackFinder = std::make_unique<MuonTrackFinder>(std::move(l3mtb), std::move(mtl));
+  theTrackFinder = std::make_unique<MuonTrackFinder>(std::move(l3mtb), std::move(mtl), iC);
 
   theL2SeededTkLabel =
       trackLoaderParameters.getUntrackedParameter<std::string>("MuonSeededTracksInstance", std::string());

RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.cc

@@ -80,7 +80,7 @@ StandAloneMuonProducer::StandAloneMuonProducer(const ParameterSet& parameterSet)
     trajectoryBuilder =
         std::make_unique<StandAloneMuonTrajectoryBuilder>(trajectoryBuilderParameters, theService.get(), iC);
   }
-  theTrackFinder = std::make_unique<MuonTrackFinder>(std::move(trajectoryBuilder), std::move(trackLoader));
+  theTrackFinder = std::make_unique<MuonTrackFinder>(std::move(trajectoryBuilder), std::move(trackLoader), iC);
 
   setAlias(parameterSet.getParameter<std::string>("@module_label"));
 

RecoMuon/TrackingTools/interface/MuonTrackFinder.h

@@ -12,18 +12,13 @@
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "RecoMuon/TrackingTools/interface/MuonCandidate.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/FrameworkfwdMostUsed.h"
 
 #include <vector>
 
-namespace edm {
-  class ParameterSet;
-  class Event;
-  class EventSetup;
-}  // namespace edm
-class TrackerTopology;
-
 class MuonTrajectoryBuilder;
 class MuonTrajectoryCleaner;
 class MuonTrackLoader;
@@ -37,12 +32,14 @@ class MuonTrackFinder {
 public:
   /// Constructor, with default cleaner. For the STA reconstruction the trackLoader must have the propagator.
   MuonTrackFinder(std::unique_ptr<MuonTrajectoryBuilder> ConcreteMuonTrajectoryBuilder,
-                  std::unique_ptr<MuonTrackLoader> trackLoader);
+                  std::unique_ptr<MuonTrackLoader> trackLoader,
+                  edm::ConsumesCollector iC);
 
   /// Constructor, with user-defined cleaner. For the STA reconstruction the trackLoader must have the propagator.
   MuonTrackFinder(std::unique_ptr<MuonTrajectoryBuilder> ConcreteMuonTrajectoryBuilder,
                   std::unique_ptr<MuonTrackLoader> trackLoader,
-                  std::unique_ptr<MuonTrajectoryCleaner> cleaner);
+                  std::unique_ptr<MuonTrajectoryCleaner> cleaner,
+                  edm::ConsumesCollector iC);
 
   /// destructor
   virtual ~MuonTrackFinder();
@@ -68,6 +65,8 @@ class MuonTrackFinder {
   void load(CandidateContainer&, edm::Event&, const TrackerTopology& ttopo);
 
 private:
+  const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> theTtopoToken;
+
   std::unique_ptr<MuonTrajectoryBuilder> theTrajBuilder;
 
   std::unique_ptr<MuonTrajectoryCleaner> theTrajCleaner;

RecoMuon/TrackingTools/src/MuonTrackFinder.cc

@@ -22,24 +22,25 @@
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
-
 using namespace std;
 using namespace edm;
 
 // Constructor, with default cleaner. For the STA reconstruction the trackLoader must have the propagator.
 MuonTrackFinder::MuonTrackFinder(std::unique_ptr<MuonTrajectoryBuilder> ConcreteMuonTrajectoryBuilder,
-                                 std::unique_ptr<MuonTrackLoader> trackLoader)
-    : theTrajBuilder(std::move(ConcreteMuonTrajectoryBuilder)),
-      theTrajCleaner(new MuonTrajectoryCleaner()),
-      theTrackLoader(std::move(trackLoader)) {}
+                                 std::unique_ptr<MuonTrackLoader> trackLoader,
+                                 edm::ConsumesCollector iC)
+    : MuonTrackFinder(std::move(ConcreteMuonTrajectoryBuilder),
+                      std::move(trackLoader),
+                      std::make_unique<MuonTrajectoryCleaner>(),
+                      iC) {}
 
 // Constructor, with user-defined cleaner. For the STA reconstruction the trackLoader must have the propagator.
 MuonTrackFinder::MuonTrackFinder(std::unique_ptr<MuonTrajectoryBuilder> ConcreteMuonTrajectoryBuilder,
                                  std::unique_ptr<MuonTrackLoader> trackLoader,
-                                 std::unique_ptr<MuonTrajectoryCleaner> cleaner)
-    : theTrajBuilder(std::move(ConcreteMuonTrajectoryBuilder)),
+                                 std::unique_ptr<MuonTrajectoryCleaner> cleaner,
+                                 edm::ConsumesCollector iC)
+    : theTtopoToken(iC.esConsumes()),
+      theTrajBuilder(std::move(ConcreteMuonTrajectoryBuilder)),
       theTrajCleaner(std::move(cleaner)),
       theTrackLoader(std::move(trackLoader)) {}
 
@@ -72,8 +73,7 @@ edm::OrphanHandle<reco::TrackCollection> MuonTrackFinder::reconstruct(
   // Percolate the event
   setEvent(event);
 
-  edm::ESHandle<TrackerTopology> httopo;
-  es.get<TrackerTopologyRcd>().get(httopo);
+  const auto& ttopo = es.getData(theTtopoToken);
 
   // Trajectory container
   TrajectoryContainer muonTrajectories;
@@ -96,7 +96,7 @@ edm::OrphanHandle<reco::TrackCollection> MuonTrackFinder::reconstruct(
 
   // convert the trajectories into tracks and load them in to the event
   LogTrace(metname) << "Convert the trajectories into tracks and load them in to the event" << endl;
-  return load(muonTrajectories, event, *httopo);
+  return load(muonTrajectories, event, ttopo);
 }
 
 // reconstruct trajectories
@@ -106,8 +106,7 @@ void MuonTrackFinder::reconstruct(const std::vector<TrackCand>& staCandColl, Eve
   // percolate the event
   setEvent(event);
 
-  edm::ESHandle<TrackerTopology> httopo;
-  es.get<TrackerTopologyRcd>().get(httopo);
+  const auto& ttopo = es.getData(theTtopoToken);
 
   // Muon Candidate container
   CandidateContainer muonCandidates;
@@ -126,5 +125,5 @@ void MuonTrackFinder::reconstruct(const std::vector<TrackCand>& staCandColl, Eve
 
   // convert the trajectories into staTracks and load them into the event
   LogTrace(metname) << "Load Muon Candidates into the event" << endl;
-  load(muonCandidates, event, *httopo);
+  load(muonCandidates, event, ttopo);
 }