HLTTauDQM: renamed IWrapper -> HistoWrapper

cms-sw · Jun 22, 2020 · e93a6d3 · e93a6d3
1 parent 75cdd2f
commit e93a6d3
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/DQMOffline/Trigger/interface/HLTTauDQML1Plotter.h b/DQMOffline/Trigger/interface/HLTTauDQML1Plotter.h
@@ -3,7 +3,7 @@
 #define HLTTauDQML1Plotter_h
 
 #include "DQMOffline/Trigger/interface/HLTTauDQMPlotter.h"
-#include "DQMOffline/Trigger/interface/IWrapper.h"
+#include "DQMOffline/Trigger/interface/HistoWrapper.h"
 
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -26,7 +26,7 @@ class HLTTauDQML1Plotter : private HLTTauDQMPlotter {
 
   using HLTTauDQMPlotter::isValid;
 
-  void bookHistograms(IWrapper &iWrapper, DQMStore::IBooker &iBooker);
+  void bookHistograms(HistoWrapper &iWrapper, DQMStore::IBooker &iBooker);
   void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup, const HLTTauDQMOfflineObjects& refC);
 
 private:

diff --git a/DQMOffline/Trigger/interface/HLTTauDQMOfflineSource.h b/DQMOffline/Trigger/interface/HLTTauDQMOfflineSource.h
@@ -13,7 +13,7 @@
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 //Plotters
-#include "DQMOffline/Trigger/interface/IWrapper.h"
+#include "DQMOffline/Trigger/interface/HistoWrapper.h"
 #include "DQMOffline/Trigger/interface/HLTTauDQML1Plotter.h"
 #include "DQMOffline/Trigger/interface/HLTTauDQMPathPlotter.h"
 #include "DQMOffline/Trigger/interface/HLTTauDQMPathSummaryPlotter.h"
@@ -50,7 +50,7 @@ class HLTTauDQMOfflineSource : public DQMEDAnalyzer {
   const double ptMax_, highPtMax_, l1MatchDr_, hltMatchDr_;
   const std::string dqmBaseFolder_;
 
-  IWrapper *iWrapper;
+  HistoWrapper *iWrapper;
 
   HLTConfigProvider HLTCP_;
 

diff --git a/DQMOffline/Trigger/interface/HLTTauDQMPathPlotter.h b/DQMOffline/Trigger/interface/HLTTauDQMPathPlotter.h
@@ -4,7 +4,7 @@
 
 #include "DQMOffline/Trigger/interface/HLTTauDQMPlotter.h"
 #include "DQMOffline/Trigger/interface/HLTTauDQMPath.h"
-#include "DQMOffline/Trigger/interface/IWrapper.h"
+#include "DQMOffline/Trigger/interface/HistoWrapper.h"
 
 namespace edm {
   class Event;
@@ -36,7 +36,7 @@ class HLTTauDQMPathPlotter : private HLTTauDQMPlotter {
 
   using HLTTauDQMPlotter::isValid;
 
-  void bookHistograms(IWrapper & iWrapper, DQMStore::IBooker &iBooker);
+  void bookHistograms(HistoWrapper & iWrapper, DQMStore::IBooker &iBooker);
 
   void analyze(const edm::TriggerResults &triggerResults,
                const trigger::TriggerEvent &triggerEvent,

diff --git a/DQMOffline/Trigger/interface/HLTTauDQMPathSummaryPlotter.h b/DQMOffline/Trigger/interface/HLTTauDQMPathSummaryPlotter.h
@@ -3,7 +3,7 @@
 #define HLTTauDQMPathSummaryPlotter_h
 
 #include "DQMOffline/Trigger/interface/HLTTauDQMPlotter.h"
-#include "DQMOffline/Trigger/interface/IWrapper.h"
+#include "DQMOffline/Trigger/interface/HistoWrapper.h"
 
 #include <vector>
 
@@ -26,7 +26,7 @@ class HLTTauDQMPathSummaryPlotter : private HLTTauDQMPlotter {
   using HLTTauDQMPlotter::isValid;
 
   void setPathObjects(const std::vector<const HLTTauDQMPath*>& pathObjects) { pathObjects_ = pathObjects; }
-  void bookHistograms(IWrapper &iWrapper, DQMStore::IBooker &iBooker);
+  void bookHistograms(HistoWrapper &iWrapper, DQMStore::IBooker &iBooker);
 
   void analyze(const edm::TriggerResults& triggerResults,
                const trigger::TriggerEvent& triggerEvent,

diff --git a/DQMOffline/Trigger/interface/HLTTauDQMTagAndProbePlotter.h b/DQMOffline/Trigger/interface/HLTTauDQMTagAndProbePlotter.h
@@ -4,7 +4,7 @@
 
 #include "DQMOffline/Trigger/interface/HLTTauDQMPlotter.h"
 #include "DQMOffline/Trigger/interface/HLTTauDQMPath.h"
-#include "DQMOffline/Trigger/interface/IWrapper.h"
+#include "DQMOffline/Trigger/interface/HistoWrapper.h"
 
 //#include "CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h"
 #include "FWCore/Common/interface/TriggerNames.h"
@@ -30,7 +30,7 @@ class HLTTauDQMTagAndProbePlotter : private HLTTauDQMPlotter {
 
   using HLTTauDQMPlotter::isValid;
 
-  void bookHistograms(IWrapper &iWrapper, DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup);
+  void bookHistograms(HistoWrapper &iWrapper, DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup);
 
   void analyze(edm::Event const &iEvent,
                const edm::TriggerResults &triggerResults,

diff --git a/DQMOffline/Trigger/interface/IWrapper.h → DQMOffline/Trigger/interface/HistoWrapper.h b/DQMOffline/Trigger/interface/IWrapper.h → DQMOffline/Trigger/interface/HistoWrapper.h
@@ -1,5 +1,5 @@
-#ifndef __IWrapper__
-#define __IWrapper__
+#ifndef __HistoWrapper__
+#define __HistoWrapper__
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -10,10 +10,10 @@ typedef dqm::legacy::MonitorElement MonitorElement;
 
 enum PL {kEverything, kVital};
 
-class IWrapper {
+class HistoWrapper {
  public:
-  IWrapper(const edm::ParameterSet&);
-  ~IWrapper();
+  HistoWrapper(const edm::ParameterSet&);
+  ~HistoWrapper();
 
   MonitorElement* book1D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int const nchX, double const lowX, double const highX, int level = kEverything);
   MonitorElement* book2D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int nchX, double lowX, double highX, int nchY, double lowY, double highY, int level = kEverything);

diff --git a/DQMOffline/Trigger/plugins/HLTTauDQMOfflineSource.cc b/DQMOffline/Trigger/plugins/HLTTauDQMOfflineSource.cc
@@ -32,7 +32,7 @@ HLTTauDQMOfflineSource::HLTTauDQMOfflineSource(const edm::ParameterSet& ps)
   edm::ParameterSet matching = ps.getParameter<edm::ParameterSet>("Matching");
   doRefAnalysis_ = matching.getUntrackedParameter<bool>("doMatching");
 
-  iWrapper = new IWrapper(ps);
+  iWrapper = new HistoWrapper(ps);
 
   if (ps.exists("L1Plotter") && !ps.exists("TagAndProbe")) {
     l1Plotter_ = std::make_unique<HLTTauDQML1Plotter>(ps.getUntrackedParameter<edm::ParameterSet>("L1Plotter"),

diff --git a/DQMOffline/Trigger/src/HLTTauDQML1Plotter.cc b/DQMOffline/Trigger/src/HLTTauDQML1Plotter.cc
@@ -46,7 +46,7 @@ HLTTauDQML1Plotter::HLTTauDQML1Plotter(const edm::ParameterSet& ps,
   configValid_ = true;
 }
 
-void HLTTauDQML1Plotter::bookHistograms(IWrapper &iWrapper, DQMStore::IBooker &iBooker) {
+void HLTTauDQML1Plotter::bookHistograms(HistoWrapper &iWrapper, DQMStore::IBooker &iBooker) {
   if (!configValid_)
     return;
 

diff --git a/DQMOffline/Trigger/src/HLTTauDQMPathPlotter.cc b/DQMOffline/Trigger/src/HLTTauDQMPathPlotter.cc
@@ -39,7 +39,7 @@ HLTTauDQMPathPlotter::HLTTauDQMPathPlotter(const std::string& pathName,
 
 #include <algorithm>
 //void HLTTauDQMPathPlotter::bookHistograms(DQMStore::IBooker& iBooker) {
-void HLTTauDQMPathPlotter::bookHistograms(IWrapper & iWrapper, DQMStore::IBooker &iBooker) {
+void HLTTauDQMPathPlotter::bookHistograms(HistoWrapper & iWrapper, DQMStore::IBooker &iBooker) {
   if (!isValid())
     return;
 

diff --git a/DQMOffline/Trigger/src/HLTTauDQMPathSummaryPlotter.cc b/DQMOffline/Trigger/src/HLTTauDQMPathSummaryPlotter.cc
@@ -9,7 +9,7 @@ HLTTauDQMPathSummaryPlotter::HLTTauDQMPathSummaryPlotter(const edm::ParameterSet
 
 HLTTauDQMPathSummaryPlotter::~HLTTauDQMPathSummaryPlotter() = default;
 
-void HLTTauDQMPathSummaryPlotter::bookHistograms(IWrapper &iWrapper, DQMStore::IBooker &iBooker) {
+void HLTTauDQMPathSummaryPlotter::bookHistograms(HistoWrapper &iWrapper, DQMStore::IBooker &iBooker) {
   if (!isValid() || pathObjects_.empty())
     return;
 

diff --git a/DQMOffline/Trigger/src/HLTTauDQMTagAndProbePlotter.cc b/DQMOffline/Trigger/src/HLTTauDQMTagAndProbePlotter.cc
@@ -46,7 +46,7 @@ HLTTauDQMTagAndProbePlotter::HLTTauDQMTagAndProbePlotter(const edm::ParameterSet
 }
 
 #include <algorithm>
-void HLTTauDQMTagAndProbePlotter::bookHistograms(IWrapper& iWrapper, DQMStore::IBooker &iBooker,
+void HLTTauDQMTagAndProbePlotter::bookHistograms(HistoWrapper& iWrapper, DQMStore::IBooker &iBooker,
                                                  edm::Run const& iRun,
                                                  edm::EventSetup const& iSetup) {
   if (!isValid())

diff --git a/DQMOffline/Trigger/src/IWrapper.cc → DQMOffline/Trigger/src/HistoWrapper.cc b/DQMOffline/Trigger/src/IWrapper.cc → DQMOffline/Trigger/src/HistoWrapper.cc
@@ -1,19 +1,19 @@
-#include "DQMOffline/Trigger/interface/IWrapper.h"
+#include "DQMOffline/Trigger/interface/HistoWrapper.h"
 
-IWrapper::IWrapper(const edm::ParameterSet& pset){
+HistoWrapper::HistoWrapper(const edm::ParameterSet& pset){
   plotlevel = (PL)pset.getUntrackedParameter<int>("PlotLevel", int(kEverything));
   cAllHistograms = 0;
   cPlottedHistograms = 0;
 }
 
-IWrapper::~IWrapper(){
+HistoWrapper::~HistoWrapper(){
   std::string s_pl = "kEverything";
   if(plotlevel == 1) s_pl = "kVital";
   std::cout << "Plot level " << plotlevel << " " << s_pl << std::endl;
   std::cout << "Plotting " << cPlottedHistograms << " out of " << cAllHistograms << std::endl;
 }
 
-MonitorElement* IWrapper::book1D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int const nchX, double const lowX, double const highX, int level){
+MonitorElement* HistoWrapper::book1D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int const nchX, double const lowX, double const highX, int level){
   cAllHistograms++;
   if(level >= plotlevel){
     cPlottedHistograms++;
@@ -23,7 +23,7 @@ MonitorElement* IWrapper::book1D(DQMStore::IBooker& iBooker, TString const &name
   return 0;
 }
 
-MonitorElement* IWrapper::book2D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int nchX, double lowX, double highX, int nchY, double lowY, double highY, int level){
+MonitorElement* HistoWrapper::book2D(DQMStore::IBooker& iBooker, TString const &name, TString const &title, int nchX, double lowX, double highX, int nchY, double lowY, double highY, int level){
   cAllHistograms++;
   if(level >= plotlevel){
     cPlottedHistograms++;