SiStripMonitorClient cleanup

DQM/SiStripMonitorClient/interface/SiStripActionExecutor.h

@@ -1,76 +1,77 @@
 #ifndef _SiStripActionExecutor_h_
 #define _SiStripActionExecutor_h_
 
+#include "DQM/SiStripMonitorClient/interface/SiStripConfigWriter.h"
+#include "DQM/SiStripMonitorClient/interface/SiStripQualityChecker.h"
+#include "DQM/SiStripMonitorClient/interface/SiStripSummaryCreator.h"
+#include "DQM/SiStripMonitorClient/interface/SiStripTrackerMapCreator.h"
+
 #include "DQMServices/Core/interface/MonitorElement.h"
+
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
 #include <map>
 #include <vector>
 #include <string>
 #include <TTree.h>
 
-class SiStripSummaryCreator;
 class DQMStore;
 class MonitorUserInterface;
-class SiStripTrackerMapCreator;
-class SiStripQualityChecker;
 class SiStripFedCabling;
 class SiStripDetCabling;
-class SiStripConfigWriter;
-class SiStripDetInfoFileReader;
 
 class SiStripActionExecutor {
-
- public:
-
+public:
   SiStripActionExecutor(edm::ParameterSet const& ps);
   virtual ~SiStripActionExecutor();
 
-
- bool readConfiguration();
- // bool readTkMapConfiguration();
- bool readTkMapConfiguration(const edm::EventSetup& eSetup);
-
- void saveMEs(DQMStore * dqm_store, std::string fname);
- void createSummary(DQMStore* dqm_store);
- void createSummaryOffline(DQMStore* dqm_store);
- void createTkMap(const edm::ParameterSet & tkmapPset, 
-                  DQMStore* dqm_store, std::string& map_type, const edm::EventSetup& eSetup);
- void createOfflineTkMap(const edm::ParameterSet & tkmapPset,
-			 DQMStore* dqm_store, std::string& map_type, const edm::EventSetup& eSetup);
- void createTkInfoFile(std::vector<std::string> tkhmap_names, TTree* tkinfo_tree, DQMStore* dqm_store);
-
- void createStatus(DQMStore* dqm_store);
- void fillDummyStatus();
- void fillStatus(DQMStore* dqm_store, const edm::ESHandle<SiStripDetCabling>& fedcabling, const edm::EventSetup& eSetup);
- void fillStatusAtLumi(DQMStore* dqm_store);
-
- void createDummyShiftReport();
- void createShiftReport(DQMStore * dqm_store);
- void printReportSummary(MonitorElement* me, std::ostringstream& str_val, std::string name);
- void printShiftHistoParameters(DQMStore * dqm_store,
-             std::map<std::string, std::vector<std::string> >&layout_map,std::ostringstream& str_val);
- void printFaultyModuleList(DQMStore * dqm_store, std::ostringstream& str_val);
- void createFaultyModuleMEs(DQMStore *dqm_store);
-
- private:
-
-  std::vector<std::string> tkMapMENames;
-
-  SiStripSummaryCreator* summaryCreator_;
-  SiStripTrackerMapCreator* tkMapCreator_;
-  SiStripQualityChecker*   qualityChecker_;
-
-  SiStripConfigWriter* configWriter_;
-
-  SiStripDetInfoFileReader* detInfoFileReader_;
-
-  edm::ParameterSet pSet_;
-
+  bool readConfiguration();
+  bool readTkMapConfiguration(const edm::EventSetup& eSetup);
+
+  void saveMEs(DQMStore& dqm_store, std::string fname);
+  void createSummary(DQMStore& dqm_store);
+  void createSummaryOffline(DQMStore& dqm_store);
+  void createTkMap(const edm::ParameterSet& tkmapPset,
+                   DQMStore& dqm_store,
+                   std::string& map_type,
+                   const edm::EventSetup& eSetup);
+  void createOfflineTkMap(const edm::ParameterSet& tkmapPset,
+                          DQMStore& dqm_store,
+                          std::string& map_type,
+                          const edm::EventSetup& eSetup);
+  void createTkInfoFile(std::vector<std::string> tkhmap_names,
+                        TTree* tkinfo_tree,
+                        DQMStore& dqm_store);
+
+  void createStatus(DQMStore& dqm_store);
+  void fillDummyStatus();
+  void fillStatus(DQMStore& dqm_store,
+                  edm::ESHandle<SiStripDetCabling> const& fedcabling,
+                  edm::EventSetup const& eSetup);
+  void fillStatusAtLumi(DQMStore& dqm_store);
+
+  void createDummyShiftReport();
+  void createShiftReport(DQMStore& dqm_store);
+  void printReportSummary(MonitorElement* me,
+                          std::ostringstream& str_val,
+                          std::string name);
+  void printShiftHistoParameters(
+    DQMStore& dqm_store,
+    std::map<std::string, std::vector<std::string>> const& layout_map,
+    std::ostringstream& str_val);
+  void printFaultyModuleList(DQMStore& dqm_store, std::ostringstream& str_val);
+  void createFaultyModuleMEs(DQMStore& dqm_store);
+
+private:
+  std::vector<std::string> tkMapMENames{};
+
+  std::unique_ptr<SiStripSummaryCreator> summaryCreator_{nullptr};
+  std::unique_ptr<SiStripTrackerMapCreator> tkMapCreator_{nullptr};
+  std::unique_ptr<SiStripQualityChecker> qualityChecker_{nullptr};
+  std::unique_ptr<SiStripConfigWriter> configWriter_{nullptr};
+
+  edm::ParameterSet const pSet_;
 };
 #endif

DQM/SiStripMonitorClient/interface/SiStripHistoPlotter.h

@@ -16,36 +16,43 @@ class TH1;
 
 class SiStripHistoPlotter {
 
- public:
-
+public:
   SiStripHistoPlotter();
- ~SiStripHistoPlotter();
+  ~SiStripHistoPlotter();
 
   void getNamedImageBuffer(const std::string& path, std::string& image);
   void createPlots(DQMStore* dqm_store);
-  void setNewPlot(std::string& path,  std::string& option, 
-                  int width, int height);
+  void setNewPlot(std::string const& path,
+                  std::string const& option,
+                  int width,
+                  int height);
   void createStaticPlot(MonitorElement* me, const std::string& file_name);
   void createCondDBPlots(DQMStore* dqm_store);
-  void setNewCondDBPlot(std::string& path,  std::string& option, 
-                  int width, int height);
-  bool plotsToMake() { return  ((!plotList_.empty()) ? true : false);}
-  bool condDBPlotsToMake(){ return ((!condDBPlotList_.empty()) ? true : false);}
-
-
- private:
-
-
-  struct PlotParameter { 
+  void setNewCondDBPlot(std::string const& path,
+                        std::string const& option,
+                        int width,
+                        int height);
+  bool
+  plotsToMake()
+  {
+    return !plotList_.empty();
+  }
+  bool
+  condDBPlotsToMake()
+  {
+    return !condDBPlotList_.empty();
+  }
+
+private:
+  struct PlotParameter {
     std::string Path;
     std::string Option;
     int         CWidth;
     int         CHeight;
-
   };
 
   void fillNamedImageBuffer(TCanvas * c1, const std::string& name);
-  void makePlot(DQMStore* dqm_store, const PlotParameter& par);
+  void makePlot(DQMStore const* dqm_store, const PlotParameter& par);
   void makeCondDBPlots(DQMStore* dqm_store, const PlotParameter& par);
   bool hasNamedImage(const std::string & name);
   void createDummyImage(const std::string& name);
@@ -54,10 +61,9 @@ class SiStripHistoPlotter {
   void setDrawingOption(TH1* hist);
   void getProjection(MonitorElement* me, TH1F* tp);
 
-
   std::map<std::string, std::string>   namedPictureBuffer_;
   std::vector<PlotParameter>           plotList_;
   std::vector<PlotParameter>           condDBPlotList_;
-
 };
+
 #endif