cms-sw · cmsbuild · Feb 11, 2020 · Jan 29, 2020
diff --git a/Alignment/OfflineValidation/plugins/ResidualRefitting.cc b/Alignment/OfflineValidation/plugins/ResidualRefitting.cc
@@ -10,6 +10,7 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -71,7 +72,7 @@ ResidualRefitting::ResidualRefitting(const edm::ParameterSet& cfg)
   edm::ParameterSet serviceParameters = cfg.getParameter<edm::ParameterSet>("ServiceParameters");
 
   // the services
-  theService = new MuonServiceProxy(serviceParameters);
+  theService = new MuonServiceProxy(serviceParameters, consumesCollector());
 
 }  //The constructor
 

diff --git a/DQM/MuonMonitor/plugins/CosmicMuonRecoAnalyzer.cc b/DQM/MuonMonitor/plugins/CosmicMuonRecoAnalyzer.cc
@@ -15,7 +15,6 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
@@ -35,7 +34,6 @@ class CosmicMuonRecoAnalyzer : public DQMEDAnalyzer {
 
 private:
   // ----------member data ---------------------------
-  MuonServiceProxy* theService;
   edm::ParameterSet parameters;
 
   edm::EDGetTokenT<edm::View<reco::Track> > theMuonCollectionLabel_;
@@ -104,7 +102,6 @@ CosmicMuonRecoAnalyzer::CosmicMuonRecoAnalyzer(const edm::ParameterSet& pSet) {
   parameters = pSet;
 
   // the services:
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
   theMuonCollectionLabel_ = consumes<edm::View<reco::Track> >(parameters.getParameter<edm::InputTag>("MuonCollection"));
 
   nTrkBin = parameters.getParameter<int>("nTrkBin");
@@ -139,7 +136,7 @@ CosmicMuonRecoAnalyzer::CosmicMuonRecoAnalyzer(const edm::ParameterSet& pSet) {
   theFolder = parameters.getParameter<string>("folder");
 }
 
-CosmicMuonRecoAnalyzer::~CosmicMuonRecoAnalyzer() { delete theService; }
+CosmicMuonRecoAnalyzer::~CosmicMuonRecoAnalyzer() {}
 
 void CosmicMuonRecoAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
                                             edm::Run const& /*iRun*/,
@@ -216,7 +213,6 @@ void CosmicMuonRecoAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
 
 void CosmicMuonRecoAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   LogTrace(metname) << "[MuonRecoAnalyzer] Analyze the mu";
-  theService->update(iSetup);
 
   // Take the muon container
   edm::Handle<edm::View<reco::Track> > muons;

diff --git a/DQMOffline/Muon/interface/EfficiencyAnalyzer.h b/DQMOffline/Muon/interface/EfficiencyAnalyzer.h
@@ -19,7 +19,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
@@ -43,7 +42,6 @@ class EfficiencyAnalyzer : public DQMEDAnalyzer {
 
 private:
   edm::ParameterSet parameters;
-  MuonServiceProxy* theService;
 
   // Switch for verbosity
   std::string metname;

diff --git a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h
@@ -20,7 +20,6 @@
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
@@ -41,7 +40,6 @@ class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer {
 private:
   // ----------member data ---------------------------
   edm::ParameterSet parameters;
-  MuonServiceProxy *theService;
   edm::EDGetTokenT<reco::MuonCollection> theMuonCollectionLabel_;
 
   // Switch for verbosity

diff --git a/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h b/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h
@@ -28,7 +28,6 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/MuonReco/interface/MuonSelectors.h"
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
 class MuonKinVsEtaAnalyzer : public DQMEDAnalyzer {
 public:
@@ -43,7 +42,6 @@ class MuonKinVsEtaAnalyzer : public DQMEDAnalyzer {
 
 private:
   // ----------member data ---------------------------
-  MuonServiceProxy *theService;
   edm::ParameterSet parameters;
 
   // Switch for verbosity

diff --git a/DQMOffline/Muon/interface/MuonRecoAnalyzer.h b/DQMOffline/Muon/interface/MuonRecoAnalyzer.h
@@ -20,8 +20,6 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
-
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
@@ -51,7 +49,6 @@ class MuonRecoAnalyzer : public DQMEDAnalyzer {
 
 private:
   // ----------member data ---------------------------
-  MuonServiceProxy* theService;
   edm::ParameterSet parameters;
 
   edm::EDGetTokenT<edm::View<reco::Muon> > theMuonCollectionLabel_;

diff --git a/DQMOffline/Muon/interface/MuonRecoOneHLT.h b/DQMOffline/Muon/interface/MuonRecoOneHLT.h
@@ -10,7 +10,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
@@ -55,7 +54,6 @@ class MuonRecoOneHLT : public DQMEDAnalyzer {
 private:
   // ----------member data ---------------------------
   edm::ParameterSet parameters;
-  MuonServiceProxy* theService;
 
   // Switch for verbosity
   std::string metname;

diff --git a/DQMOffline/Muon/interface/MuonTiming.h b/DQMOffline/Muon/interface/MuonTiming.h
@@ -20,8 +20,6 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
-
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
@@ -39,7 +37,6 @@ class MuonTiming : public DQMEDAnalyzer {
 
 private:
   // ----------member data ---------------------------
-  MuonServiceProxy *theService;
 
   edm::EDGetTokenT<edm::View<reco::Muon> > theMuonCollectionLabel_;
   // Switch for verbosity

diff --git a/DQMOffline/Muon/interface/SegmentTrackAnalyzer.h b/DQMOffline/Muon/interface/SegmentTrackAnalyzer.h
@@ -17,7 +17,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 #include "RecoMuon/TrackingTools/interface/SegmentsTrackAssociator.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
@@ -32,17 +31,13 @@ class SegmentTrackAnalyzer : public DQMEDAnalyzer {
   SegmentTrackAnalyzer(const edm::ParameterSet&);
 
   /// Destructor
-  ~SegmentTrackAnalyzer() override {
-    delete theService;
-    delete theSegmentsAssociator;
-  };
+  ~SegmentTrackAnalyzer() override { delete theSegmentsAssociator; };
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
 
 private:
   // ----------member data ---------------------------
-  MuonServiceProxy* theService;
   edm::ParameterSet parameters;
   edm::EDGetTokenT<reco::TrackCollection> theMuTrackCollectionLabel_;
 

diff --git a/DQMOffline/Muon/interface/TriggerMatchMonitor.h b/DQMOffline/Muon/interface/TriggerMatchMonitor.h
@@ -27,7 +27,6 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/MuonReco/interface/MuonSelectors.h"
-#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
@@ -47,7 +46,6 @@ class TriggerMatchMonitor : public DQMEDAnalyzer {
 
 private:
   // ----------member data ---------------------------
-  MuonServiceProxy* theService;
   edm::ParameterSet parameters;
 
   // triggerNames to be passed from config

diff --git a/DQMOffline/Muon/src/EfficiencyAnalyzer.cc b/DQMOffline/Muon/src/EfficiencyAnalyzer.cc
@@ -29,8 +29,6 @@ using namespace edm;
 EfficiencyAnalyzer::EfficiencyAnalyzer(const edm::ParameterSet& pSet) {
   parameters = pSet;
 
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-
   // DATA
   theMuonCollectionLabel_ = consumes<edm::View<reco::Muon> >(parameters.getParameter<edm::InputTag>("MuonCollection"));
   theTrackCollectionLabel_ = consumes<reco::TrackCollection>(parameters.getParameter<edm::InputTag>("TrackCollection"));
@@ -60,7 +58,7 @@ EfficiencyAnalyzer::EfficiencyAnalyzer(const edm::ParameterSet& pSet) {
   theFolder = parameters.getParameter<string>("folder");
 }
 
-EfficiencyAnalyzer::~EfficiencyAnalyzer() { delete theService; }
+EfficiencyAnalyzer::~EfficiencyAnalyzer() {}
 
 void EfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
                                         edm::Run const& /*iRun*/,
@@ -159,7 +157,6 @@ void EfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
 
 void EfficiencyAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   LogTrace(metname) << "[EfficiencyAnalyzer] Analyze the mu in different eta regions";
-  theService->update(iSetup);
   // ==========================================================
   // BEGIN READ DATA:
   // Muon information

diff --git a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc
@@ -24,9 +24,6 @@ using namespace edm;
 MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet) {
   parameters = pSet;
 
-  // the services
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-
   theMuonCollectionLabel_ = consumes<reco::MuonCollection>(parameters.getParameter<InputTag>("MuonCollection"));
 
   AlgoName = parameters.getParameter<std::string>("AlgoName");
@@ -54,7 +51,7 @@ MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pS
   hoS9NoMin = parameters.getParameter<double>("hoS9SizeMin");
   hoS9NoMax = parameters.getParameter<double>("hoS9SizeMax");
 }
-MuonEnergyDepositAnalyzer::~MuonEnergyDepositAnalyzer() { delete theService; }
+MuonEnergyDepositAnalyzer::~MuonEnergyDepositAnalyzer() {}
 void MuonEnergyDepositAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
                                                edm::Run const& /*iRun*/,
                                                edm::EventSetup const& /* iSetup */) {
@@ -160,7 +157,6 @@ void MuonEnergyDepositAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
 }
 void MuonEnergyDepositAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   LogTrace(metname) << "[MuonEnergyDepositAnalyzer] Filling the histos";
-  theService->update(iSetup);
 
   // Take the muon container
   edm::Handle<reco::MuonCollection> muons;

diff --git a/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc b/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc
@@ -21,9 +21,6 @@ MuonKinVsEtaAnalyzer::MuonKinVsEtaAnalyzer(const edm::ParameterSet& pSet) {
 
   parameters = pSet;
 
-  // the services
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-
   theMuonCollectionLabel_ = consumes<edm::View<reco::Muon> >(parameters.getParameter<edm::InputTag>("MuonCollection"));
   theVertexLabel_ = consumes<reco::VertexCollection>(parameters.getParameter<edm::InputTag>("VertexLabel"));
 
@@ -61,7 +58,7 @@ MuonKinVsEtaAnalyzer::MuonKinVsEtaAnalyzer(const edm::ParameterSet& pSet) {
 
   theFolder = parameters.getParameter<string>("folder");
 }
-MuonKinVsEtaAnalyzer::~MuonKinVsEtaAnalyzer() { delete theService; }
+MuonKinVsEtaAnalyzer::~MuonKinVsEtaAnalyzer() {}
 
 void MuonKinVsEtaAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
                                           edm::Run const& /*iRun*/,
@@ -167,7 +164,6 @@ void MuonKinVsEtaAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
 }
 void MuonKinVsEtaAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   LogTrace(metname) << "[MuonKinVsEtaAnalyzer] Analyze the mu in different eta regions";
-  theService->update(iSetup);
 
   edm::Handle<edm::View<reco::Muon> > muons;
   iEvent.getByToken(theMuonCollectionLabel_, muons);

diff --git a/DQMOffline/Muon/src/MuonRecoAnalyzer.cc b/DQMOffline/Muon/src/MuonRecoAnalyzer.cc
@@ -22,7 +22,6 @@ MuonRecoAnalyzer::MuonRecoAnalyzer(const edm::ParameterSet& pSet) {
   IsminiAOD = parameters.getParameter<bool>("IsminiAOD");
   doMVA = parameters.getParameter<bool>("doMVA");
   // the services:
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
   theMuonCollectionLabel_ = consumes<edm::View<reco::Muon> >(parameters.getParameter<edm::InputTag>("MuonCollection"));
   theVertexLabel_ = consumes<reco::VertexCollection>(pSet.getParameter<InputTag>("inputTagVertex"));
   theBeamSpotLabel_ = consumes<reco::BeamSpot>(pSet.getParameter<InputTag>("inputTagBeamSpot"));
@@ -60,7 +59,7 @@ MuonRecoAnalyzer::MuonRecoAnalyzer(const edm::ParameterSet& pSet) {
   theFolder = parameters.getParameter<string>("folder");
 }
 
-MuonRecoAnalyzer::~MuonRecoAnalyzer() { delete theService; }
+MuonRecoAnalyzer::~MuonRecoAnalyzer() {}
 void MuonRecoAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
                                       edm::Run const& /*iRun*/,
                                       edm::EventSetup const& /* iSetup */) {
@@ -575,7 +574,6 @@ void MuonRecoAnalyzer::GetRes(reco::TrackRef t1, reco::TrackRef t2, string par,
 
 void MuonRecoAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   LogTrace(metname) << "[MuonRecoAnalyzer] Analyze the mu";
-  theService->update(iSetup);
 
   // Take the muon container
   edm::Handle<edm::View<reco::Muon> > muons;

diff --git a/DQMOffline/Muon/src/MuonRecoOneHLT.cc b/DQMOffline/Muon/src/MuonRecoOneHLT.cc
@@ -10,13 +10,9 @@ using namespace edm;
 // Uncomment to DEBUG
 //#define DEBUG
 
-MuonRecoOneHLT::MuonRecoOneHLT(
-    const edm::ParameterSet& pSet) {  //, MuonServiceProxy *theService) :MuonAnalyzerBase(theService) {
+MuonRecoOneHLT::MuonRecoOneHLT(const edm::ParameterSet& pSet) {
   parameters = pSet;
 
-  // the services
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-
   ParameterSet muonparms = parameters.getParameter<edm::ParameterSet>("SingleMuonTrigger");
   ParameterSet dimuonparms = parameters.getParameter<edm::ParameterSet>("DoubleMuonTrigger");
   _SingleMuonEventFlag = new GenericTriggerEventFlag(muonparms, consumesCollector(), *this, l1t::UseEventSetupIn::Run);
@@ -47,7 +43,6 @@ MuonRecoOneHLT::MuonRecoOneHLT(
   phiMax = parameters.getParameter<double>("phiMax");
 }
 MuonRecoOneHLT::~MuonRecoOneHLT() {
-  delete theService;
   delete _SingleMuonEventFlag;
   delete _DoubleMuonEventFlag;
 }
@@ -128,8 +123,6 @@ void MuonRecoOneHLT::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&
     singlemuonExpr_ = _DoubleMuonEventFlag->expressionsFromDB(_DoubleMuonEventFlag->hltDBKey(), iSetup);
 }
 void MuonRecoOneHLT::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  theService->update(iSetup);
-
   // =================================================================================
   // Look for the Primary Vertex (and use the BeamSpot instead, if you can't find it):
   reco::Vertex::Point posVtx;

diff --git a/DQMOffline/Muon/src/MuonSeedsAnalyzer.cc b/DQMOffline/Muon/src/MuonSeedsAnalyzer.cc
@@ -25,6 +25,7 @@
 #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h"
 #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <string>
@@ -35,7 +36,7 @@ using namespace edm;
 MuonSeedsAnalyzer::MuonSeedsAnalyzer(const edm::ParameterSet& pSet) {
   parameters = pSet;
 
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
+  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"), consumesCollector());
 
   theSeedsCollectionLabel_ = consumes<TrajectorySeedCollection>(parameters.getParameter<InputTag>("SeedCollection"));
 

diff --git a/DQMOffline/Muon/src/MuonTiming.cc b/DQMOffline/Muon/src/MuonTiming.cc
@@ -21,7 +21,6 @@ MuonTiming::MuonTiming(const edm::ParameterSet& pSet) {
   // Input booleans
 
   // the services:
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
   theMuonCollectionLabel_ = consumes<edm::View<reco::Muon> >(parameters.getParameter<edm::InputTag>("MuonCollection"));
 
   tnbins_ = parameters.getParameter<int>("tnbins");
@@ -56,7 +55,7 @@ MuonTiming::MuonTiming(const edm::ParameterSet& pSet) {
   theFolder_ = parameters.getParameter<string>("folder");
 }
 
-MuonTiming::~MuonTiming() { delete theService; }
+MuonTiming::~MuonTiming() {}
 
 void MuonTiming::bookHistograms(DQMStore::IBooker& ibooker,
                                 edm::Run const& /*iRun*/,
@@ -153,7 +152,6 @@ void MuonTiming::bookHistograms(DQMStore::IBooker& ibooker,
 
 void MuonTiming::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   LogTrace(metname_) << "[MuonTiming] Analyze the mu";
-  theService->update(iSetup);
 
   // Take the muon container
   edm::Handle<edm::View<reco::Muon> > muons;

diff --git a/DQMOffline/Muon/src/SegmentTrackAnalyzer.cc b/DQMOffline/Muon/src/SegmentTrackAnalyzer.cc
@@ -27,9 +27,6 @@ using namespace edm;
 SegmentTrackAnalyzer::SegmentTrackAnalyzer(const edm::ParameterSet& pSet) {
   parameters = pSet;
 
-  // MuonService
-  theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-
   // Read Data:
   theMuTrackCollectionLabel_ =
       consumes<reco::TrackCollection>(parameters.getParameter<edm::InputTag>("MuTrackCollection"));
@@ -203,8 +200,6 @@ void SegmentTrackAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
 }
 
 void SegmentTrackAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  theService->update(iSetup);
-
   Handle<reco::TrackCollection> glbTracks;
   iEvent.getByToken(theMuTrackCollectionLabel_, glbTracks);