Merge pull request #19016 from Dr15Jones/avoidCopyingPSetsTrackingMon…

…itor Avoid making three copies of a large PSet in TrackingMonitor
cms-sw · Jun 1, 2017 · 20842c5 · 20842c5
2 parents 7a28edb + 640a89f
commit 20842c5
Show file tree

Hide file tree

Showing 7 changed files with 427 additions and 421 deletions.
diff --git a/DQM/TrackingMonitor/interface/TrackAnalyzer.h b/DQM/TrackingMonitor/interface/TrackAnalyzer.h
@@ -32,15 +32,16 @@ Monitoring source for general quantities related to tracks.
 class DQMStore;
 
 class BeamSpot;
+namespace dqm {
 class TrackAnalyzer 
 {
     public:
         TrackAnalyzer(const edm::ParameterSet&);
-	TrackAnalyzer(const edm::ParameterSet&, edm::ConsumesCollector& iC);
-        virtual ~TrackAnalyzer();
-        virtual void initHisto(DQMStore::IBooker & ibooker, const edm::EventSetup &);
+        TrackAnalyzer(const edm::ParameterSet&, edm::ConsumesCollector& iC);
+        ~TrackAnalyzer();
+        void initHisto(DQMStore::IBooker & ibooker, const edm::EventSetup &, const edm::ParameterSet&);
 
-        virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup, const reco::Track& track);
+        void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup, const reco::Track& track);
 
         void doSoftReset  (DQMStore * dqmStore_);
         void doReset      ();
@@ -79,7 +80,9 @@ class TrackAnalyzer
 	edm::EDGetTokenT<LumiScalersCollection> lumiscalersToken_;
 	float lumi_factor_per_bx_;
 
-        edm::ParameterSet conf_;
+        edm::ParameterSet const* conf_;
+
+        std::string stateName_;
 
         bool doTrackerSpecific_;
         bool doAllPlots_;
@@ -461,4 +464,5 @@ class TrackAnalyzer
 
         std::string histname;  //for naming the histograms according to algorithm used
 };
+}
 #endif
diff --git a/DQM/TrackingMonitor/interface/TrackBuildingAnalyzer.h b/DQM/TrackingMonitor/interface/TrackBuildingAnalyzer.h
@@ -35,9 +35,9 @@ class TrackBuildingAnalyzer
 {
     public:
         TrackBuildingAnalyzer(const edm::ParameterSet&);
-        virtual ~TrackBuildingAnalyzer();
-        virtual void initHisto(DQMStore::IBooker & ibooker);
-        virtual void analyze
+        ~TrackBuildingAnalyzer();
+        void initHisto(DQMStore::IBooker & ibooker, const edm::ParameterSet&);
+        void analyze
         (
             const edm::Event& iEvent, 
             const edm::EventSetup& iSetup, 
@@ -46,7 +46,7 @@ class TrackBuildingAnalyzer
             const edm::ESHandle<MagneticField>& theMF,
             const edm::ESHandle<TransientTrackingRecHitBuilder>& theTTRHBuilder
         );
-        virtual void analyze
+        void analyze
         (
             const edm::Event& iEvent, 
             const edm::EventSetup& iSetup, 
@@ -63,8 +63,6 @@ class TrackBuildingAnalyzer
 
         // ----------member data ---------------------------
 
-        edm::ParameterSet conf_;
-
         // Track Seeds
         MonitorElement* SeedPt;
         MonitorElement* SeedEta;

diff --git a/DQM/TrackingMonitor/interface/TrackSplittingMonitor.h b/DQM/TrackingMonitor/interface/TrackSplittingMonitor.h
@@ -34,7 +34,6 @@
 
 
 class DQMStore;
-class TrackAnalyzer;
 class TProfile;
 
 #include "DataFormats/MuonReco/interface/Muon.h"

diff --git a/DQM/TrackingMonitor/interface/TrackingMonitor.h b/DQM/TrackingMonitor/interface/TrackingMonitor.h
@@ -39,7 +39,9 @@ Monitoring source for general quantities related to tracks.
 
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 
-class TrackAnalyzer;
+namespace dqm {
+  class TrackAnalyzer;
+}
 class TrackBuildingAnalyzer;
 class VertexMonitor;
 class GetLumi;
@@ -73,7 +75,7 @@ class TrackingMonitor : public DQMEDAnalyzer
 
 	//        DQMStore * dqmStore_;
 
-        edm::ParameterSet conf_;
+        edm::ParameterSetID confID_;
 
         // the track analyzer
         edm::InputTag bsSrc_;
@@ -97,7 +99,7 @@ class TrackingMonitor : public DQMEDAnalyzer
 	std::string AlgoName_;
 
 
-        TrackAnalyzer * theTrackAnalyzer;
+        dqm::TrackAnalyzer * theTrackAnalyzer;
         TrackBuildingAnalyzer  * theTrackBuildingAnalyzer;
 	std::vector<VertexMonitor*> theVertexMonitor;
 	GetLumi*                    theLumiDetails_;