Merge pull request #35697 from Dr15Jones/esConsumesMuonLeftovers

Added esConsumes calls to more Muon related code
cms-sw · Oct 19, 2021 · 87a4087 · 87a4087
2 parents 59b5b6e + 764854b
commit 87a4087
Show file tree

Hide file tree

Showing 25 changed files with 149 additions and 142 deletions.
diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc
@@ -51,6 +51,7 @@ class AlignmentMonitorMuonSystemMap1D : public AlignmentMonitorBase {
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_esTokenDetId;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_esTokenProp;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_esTokenMF;
+  const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;
 
   // parameters
   edm::InputTag m_muonCollectionTag;
@@ -155,6 +156,7 @@ AlignmentMonitorMuonSystemMap1D::AlignmentMonitorMuonSystemMap1D(const edm::Para
       m_esTokenDetId(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
       m_esTokenProp(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_esTokenMF(iC.esConsumes()),
+      m_esTokenBuilder(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
       m_maxTrackPt(cfg.getParameter<double>("maxTrackPt")),
@@ -271,6 +273,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
   const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
   const Propagator *prop = &iSetup.getData(m_esTokenProp);
   const MagneticField *magneticField = &iSetup.getData(m_esTokenMF);
+  auto builder = iSetup.getHandle(m_esTokenBuilder);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -287,7 +290,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent,
           m_counter_trackdxy++;
 
           MuonResidualsFromTrack muonResidualsFromTrack(
-              iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
+              builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
           processMuonResidualsFromTrack(muonResidualsFromTrack, iEvent);
         }
       }  // end if track has acceptable momentum

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc
@@ -49,6 +49,7 @@ class AlignmentMonitorMuonVsCurvature : public AlignmentMonitorBase {
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_esTokenDetId;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_esTokenProp;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_esTokenMF;
+  const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;
 
   // parameters
   edm::InputTag m_muonCollectionTag;
@@ -88,6 +89,7 @@ AlignmentMonitorMuonVsCurvature::AlignmentMonitorMuonVsCurvature(const edm::Para
       m_esTokenDetId(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
       m_esTokenProp(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_esTokenMF(iC.esConsumes()),
+      m_esTokenBuilder(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
       m_minTrackP(cfg.getParameter<double>("minTrackP")),
@@ -201,6 +203,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent,
   const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
   const Propagator *prop = &iSetup.getData(m_esTokenProp);
   const MagneticField *magneticField = &iSetup.getData(m_esTokenMF);
+  auto builder = iSetup.getHandle(m_esTokenBuilder);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -211,7 +214,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent,
 
       if (track->pt() > m_minTrackPt && track->p() > m_minTrackP && fabs(track->dxy(beamSpot->position())) < m_maxDxy) {
         MuonResidualsFromTrack muonResidualsFromTrack(
-            iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
+            builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
         processMuonResidualsFromTrack(muonResidualsFromTrack, traj);
       }  // end if track pT is within range
     }    // end loop over tracks

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc
@@ -49,6 +49,7 @@ class AlignmentMonitorSegmentDifferences : public AlignmentMonitorBase {
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_esTokenDetId;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_esTokenProp;
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_esTokenMF;
+  const MuonResidualsFromTrack::BuilderToken m_esTokenBuilder;
 
   // parameters
   edm::InputTag m_muonCollectionTag;
@@ -121,6 +122,7 @@ AlignmentMonitorSegmentDifferences::AlignmentMonitorSegmentDifferences(const edm
       m_esTokenDetId(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
       m_esTokenProp(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_esTokenMF(iC.esConsumes()),
+      m_esTokenBuilder(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
       m_minTrackP(cfg.getParameter<double>("minTrackP")),
@@ -376,6 +378,7 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent,
   const DetIdAssociator *muonDetIdAssociator_ = &iSetup.getData(m_esTokenDetId);
   const Propagator *prop = &iSetup.getData(m_esTokenProp);
   const MagneticField *magneticField = &iSetup.getData(m_esTokenMF);
+  auto builder = iSetup.getHandle(m_esTokenBuilder);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -386,7 +389,7 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent,
 
       if (track->pt() > m_minTrackPt && track->p() > m_minTrackP && fabs(track->dxy(beamSpot->position())) < m_maxDxy) {
         MuonResidualsFromTrack muonResidualsFromTrack(
-            iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
+            builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
         processMuonResidualsFromTrack(muonResidualsFromTrack);
       }
     }  // end loop over tracks

diff --git a/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc b/Alignment/CommonAlignmentMonitor/plugins/TrackerToMuonPropagator.cc
@@ -26,6 +26,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 // products
@@ -105,7 +106,8 @@ TrackerToMuonPropagator::TrackerToMuonPropagator(const edm::ParameterSet& iConfi
   m_globalMuonTracks = iConfig.getParameter<edm::InputTag>("globalMuonTracks");
   m_refitTracker = iConfig.getParameter<bool>("refitTrackerTrack");
   if (m_refitTracker) {
-    m_trackTransformer = new TrackTransformer(iConfig.getParameter<edm::ParameterSet>("trackerTrackTransformer"));
+    m_trackTransformer =
+        new TrackTransformer(iConfig.getParameter<edm::ParameterSet>("trackerTrackTransformer"), consumesCollector());
   } else
     m_trackTransformer = nullptr;
 

diff --git a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsFromTrack.h
@@ -51,8 +51,11 @@
 
 class MuonResidualsFromTrack {
 public:
+  using BuilderToken = edm::ESGetToken<TransientTrackingRecHitBuilder, TransientRecHitRecord>;
+  static edm::ESInputTag builderESInputTag();
+
   // residuals from global muon trajectories
-  MuonResidualsFromTrack(const edm::EventSetup &iSetup,
+  MuonResidualsFromTrack(edm::ESHandle<TransientTrackingRecHitBuilder> builder,
                          edm::ESHandle<MagneticField> magneticField,
                          edm::ESHandle<GlobalTrackingGeometry> globalGeometry,
                          edm::ESHandle<DetIdAssociator> muonDetIdAssociator_,

diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsAlignmentAlgorithm.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsAlignmentAlgorithm.cc
@@ -55,7 +55,7 @@ CSCOverlapsAlignmentAlgorithm::CSCOverlapsAlignmentAlgorithm(const edm::Paramete
   }
 
   if (m_slopeFromTrackRefit) {
-    m_trackTransformer = new TrackTransformer(iConfig.getParameter<edm::ParameterSet>("TrackTransformer"));
+    m_trackTransformer = new TrackTransformer(iConfig.getParameter<edm::ParameterSet>("TrackTransformer"), iC);
   } else {
     m_trackTransformer = nullptr;
   }

diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc b/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc
@@ -116,6 +116,7 @@ class MuonAlignmentFromReference : public AlignmentAlgorithmBase {
   const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_MagFieldToken;
   const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_propToken;
   const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_DetIdToken;
+  const MuonResidualsFromTrack::BuilderToken m_builderToken;
 
   // configutarion paramenters:
   edm::InputTag m_muonCollectionTag;
@@ -199,6 +200,7 @@ MuonAlignmentFromReference::MuonAlignmentFromReference(const edm::ParameterSet&
       m_MagFieldToken(iC.esConsumes()),
       m_propToken(iC.esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
       m_DetIdToken(iC.esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))),
+      m_builderToken(iC.esConsumes(MuonResidualsFromTrack::builderESInputTag())),
       m_muonCollectionTag(cfg.getParameter<edm::InputTag>("muonCollectionTag")),
       m_reference(cfg.getParameter<std::vector<std::string> >("reference")),
       m_minTrackPt(cfg.getParameter<double>("minTrackPt")),
@@ -445,6 +447,7 @@ void MuonAlignmentFromReference::run(const edm::EventSetup& iSetup, const EventI
   const MagneticField* magneticField = &iSetup.getData(m_MagFieldToken);
   const Propagator* prop = &iSetup.getData(m_propToken);
   const DetIdAssociator* muonDetIdAssociator = &iSetup.getData(m_DetIdToken);
+  auto builder = iSetup.getHandle(m_builderToken);
 
   if (m_muonCollectionTag.label().empty())  // use trajectories
   {
@@ -468,7 +471,7 @@ void MuonAlignmentFromReference::run(const edm::EventSetup& iSetup, const EventI
           m_counter_trackdxy++;
           if (m_debug)
             std::cout << "JUST BEFORE muonResidualsFromTrack" << std::endl;
-          MuonResidualsFromTrack muonResidualsFromTrack(iSetup,
+          MuonResidualsFromTrack muonResidualsFromTrack(builder,
                                                         magneticField,
                                                         globalGeometry,
                                                         muonDetIdAssociator,

diff --git a/Alignment/MuonAlignmentAlgorithms/src/MuonResidualsFromTrack.cc b/Alignment/MuonAlignmentAlgorithms/src/MuonResidualsFromTrack.cc
@@ -19,7 +19,9 @@
 #include "TDecompChol.h"
 #include <cmath>
 
-MuonResidualsFromTrack::MuonResidualsFromTrack(const edm::EventSetup& iSetup,
+edm::ESInputTag MuonResidualsFromTrack::builderESInputTag() { return edm::ESInputTag("", "WithTrackAngle"); }
+
+MuonResidualsFromTrack::MuonResidualsFromTrack(edm::ESHandle<TransientTrackingRecHitBuilder> trackerRecHitBuilder,
                                                edm::ESHandle<MagneticField> magneticField,
                                                edm::ESHandle<GlobalTrackingGeometry> globalGeometry,
                                                edm::ESHandle<DetIdAssociator> muonDetIdAssociator_,
@@ -39,8 +41,6 @@ MuonResidualsFromTrack::MuonResidualsFromTrack(const edm::EventSetup& iSetup,
 
   clear();
 
-  edm::ESHandle<TransientTrackingRecHitBuilder> theTrackerRecHitBuilder;
-  iSetup.get<TransientRecHitRecord>().get("WithTrackAngle", theTrackerRecHitBuilder);
   reco::TransientTrack track(*m_recoTrack, &*magneticField, globalGeometry);
   TransientTrackingRecHit::ConstRecHitContainer recHitsForRefit;
   int iT = 0, iM = 0;
@@ -52,7 +52,7 @@ MuonResidualsFromTrack::MuonResidualsFromTrack(const edm::EventSetup& iSetup,
         if (m_debug)
           std::cout << "Tracker Hit " << iT << " is found. Add to refit. Dimension: " << hit->dimension() << std::endl;
 
-        recHitsForRefit.push_back(theTrackerRecHitBuilder->build(&*hit));
+        recHitsForRefit.push_back(trackerRecHitBuilder->build(&*hit));
       } else if (hitId.det() == DetId::Muon) {
         //        if ( hit->geographicalId().subdetId() == 3 && !theRPCInTheFit ) {
         //          LogTrace("Reco|TrackingTools|TrackTransformer") << "RPC Rec Hit discarged";

diff --git a/Alignment/MuonAlignmentAlgorithms/test/StandAloneTest.cc b/Alignment/MuonAlignmentAlgorithms/test/StandAloneTest.cc
@@ -22,7 +22,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -57,7 +57,7 @@
 // class decleration
 //
 
-class StandAloneTest : public edm::EDAnalyzer {
+class StandAloneTest : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit StandAloneTest(const edm::ParameterSet &);
   ~StandAloneTest();
@@ -69,7 +69,16 @@ class StandAloneTest : public edm::EDAnalyzer {
 
   // ----------member data ---------------------------
 
-  edm::InputTag m_Tracks;
+  const edm::InputTag m_Tracks;
+  const edm::EDGetTokenT<reco::TrackCollection> m_tracksToken;
+  const edm::EDGetTokenT<TrajTrackAssociationCollection> m_trajtracksmapToken;
+
+  const MuonResidualsFromTrack::BuilderToken m_builderToken;
+  const edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> m_globalGeometryToken;
+  const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> m_cscGeometryToken;
+  const edm::ESGetToken<Propagator, TrackingComponentsRecord> m_propToken;
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_magneticFieldToken;
+  const edm::ESGetToken<DetIdAssociator, DetIdAssociatorRecord> m_muonDetIdAssociatorToken;
 
   // declare the TTree
   TTree *m_ttree;
@@ -95,8 +104,17 @@ class StandAloneTest : public edm::EDAnalyzer {
 // constructors and destructor
 //
 StandAloneTest::StandAloneTest(const edm::ParameterSet &iConfig)
-    : m_Tracks(iConfig.getParameter<edm::InputTag>("Tracks")) {
+    : m_Tracks(iConfig.getParameter<edm::InputTag>("Tracks")),
+      m_tracksToken(consumes(m_Tracks)),
+      m_trajtracksmapToken(consumes(edm::InputTag("TrackRefitter", "Refitted"))),
+      m_builderToken(esConsumes(MuonResidualsFromTrack::builderESInputTag())),
+      m_globalGeometryToken(esConsumes()),
+      m_cscGeometryToken(esConsumes()),
+      m_propToken(esConsumes(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
+      m_magneticFieldToken(esConsumes()),
+      m_muonDetIdAssociatorToken(esConsumes(edm::ESInputTag("", "MuonDetIdAssociator"))) {
   edm::Service<TFileService> tFileService;
+  usesResource(TFileService::kSharedResource);
 
   // book the TTree
   m_ttree = tFileService->make<TTree>("ttree", "ttree");
@@ -127,23 +145,17 @@ void StandAloneTest::analyze(const edm::Event &iEvent, const edm::EventSetup &iS
   }
 
   // get tracks and refitted from the Event
-  edm::Handle<reco::TrackCollection> tracks;
-  iEvent.getByLabel(m_Tracks, tracks);
-  edm::Handle<TrajTrackAssociationCollection> trajtracksmap;
-  iEvent.getByLabel("TrackRefitter", "Refitted", trajtracksmap);
+  edm::Handle<reco::TrackCollection> tracks = iEvent.getHandle(m_tracksToken);
+  edm::Handle<TrajTrackAssociationCollection> trajtracksmap = iEvent.getHandle(m_trajtracksmapToken);
 
   // get all tracking and CSC geometries from the EventSetup
-  edm::ESHandle<GlobalTrackingGeometry> globalGeometry;
-  iSetup.get<GlobalTrackingGeometryRecord>().get(globalGeometry);
-  edm::ESHandle<CSCGeometry> cscGeometry;
-  iSetup.get<MuonGeometryRecord>().get(cscGeometry);
-
-  edm::ESHandle<Propagator> prop;
-  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAny", prop);
-  edm::ESHandle<MagneticField> magneticField;
-  iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
-  edm::ESHandle<DetIdAssociator> muonDetIdAssociator_;
-  iSetup.get<DetIdAssociatorRecord>().get("MuonDetIdAssociator", muonDetIdAssociator_);
+  edm::ESHandle<GlobalTrackingGeometry> globalGeometry = iSetup.getHandle(m_globalGeometryToken);
+  edm::ESHandle<CSCGeometry> cscGeometry = iSetup.getHandle(m_cscGeometryToken);
+
+  auto builder = iSetup.getHandle(m_builderToken);
+  edm::ESHandle<Propagator> prop = iSetup.getHandle(m_propToken);
+  edm::ESHandle<MagneticField> magneticField = iSetup.getHandle(m_magneticFieldToken);
+  edm::ESHandle<DetIdAssociator> muonDetIdAssociator_ = iSetup.getHandle(m_muonDetIdAssociatorToken);
 
   // loop over tracks
   for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) {
@@ -159,7 +171,7 @@ void StandAloneTest::analyze(const edm::Event &iEvent, const edm::EventSetup &iS
     // if good track, good trajectory
     if (track->pt() > 20. && traj != NULL && traj->isValid()) {
       // calculate all residuals on this track
-      MuonResidualsFromTrack muonResidualsFromTrack(iSetup,
+      MuonResidualsFromTrack muonResidualsFromTrack(builder,
                                                     magneticField,
                                                     globalGeometry,
                                                     muonDetIdAssociator_,

diff --git a/DQM/TrackingMonitor/src/TrackingRecoMaterialAnalyser.cc b/DQM/TrackingMonitor/src/TrackingRecoMaterialAnalyser.cc
@@ -17,7 +17,6 @@
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc b/RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc
@@ -3,6 +3,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "RecoMTD/DetLayers/interface/MTDDetLayerGeometry.h"
@@ -446,7 +447,7 @@ TrackExtenderWithMTDT<TrackCollection>::TrackExtenderWithMTDT(const ParameterSet
   }
 
   theEstimator = std::make_unique<Chi2MeasurementEstimator>(estMaxChi2_, estMaxNSigma_);
-  theTransformer = std::make_unique<TrackTransformer>(iConfig.getParameterSet("TrackTransformer"));
+  theTransformer = std::make_unique<TrackTransformer>(iConfig.getParameterSet("TrackTransformer"), consumesCollector());
 
   btlMatchChi2Token = produces<edm::ValueMap<float>>("btlMatchChi2");
   etlMatchChi2Token = produces<edm::ValueMap<float>>("etlMatchChi2");

diff --git a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc b/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc
@@ -9,7 +9,6 @@
 
 // Framework
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h b/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h
@@ -20,7 +20,6 @@
 #include "RecoMuon/GlobalTrackingTools/interface/DirectTrackerNavigation.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"

diff --git a/RecoMuon/GlobalTrackingTools/interface/GlobalMuonRefitter.h b/RecoMuon/GlobalTrackingTools/interface/GlobalMuonRefitter.h
@@ -15,7 +15,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.cc b/RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.cc
@@ -69,7 +69,8 @@ StandAloneMuonProducer::StandAloneMuonProducer(const ParameterSet& parameterSet)
     trajectoryBuilder =
         std::make_unique<StandAloneMuonTrajectoryBuilder>(trajectoryBuilderParameters, theService.get(), iC);
   else if (typeOfBuilder == "DirectMuonTrajectoryBuilder")
-    trajectoryBuilder = std::make_unique<DirectMuonTrajectoryBuilder>(trajectoryBuilderParameters, theService.get());
+    trajectoryBuilder =
+        std::make_unique<DirectMuonTrajectoryBuilder>(trajectoryBuilderParameters, theService.get(), iC);
   else if (typeOfBuilder == "Exhaustive")
     trajectoryBuilder =
         std::make_unique<ExhaustiveMuonTrajectoryBuilder>(trajectoryBuilderParameters, theService.get(), iC);