Merge pull request #26619 from cms-sw/code-format-dqm-52ae65

Running code-format for dqm
cms-sw · May 7, 2019 · f686c84 · f686c84
2 parents 14d40ab + 46c1db4
commit f686c84
Show file tree

Hide file tree

Showing 200 changed files with 31,782 additions and 26,370 deletions.
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESClient.h
@@ -3,60 +3,60 @@
 
 #include <string>
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 namespace edm {
-  class ParameterSet;
+class ParameterSet;
 }
 
 class ESClient {
 
- public:
-
-  ESClient(edm::ParameterSet const&);
+public:
+  ESClient(edm::ParameterSet const &);
   virtual ~ESClient() {}
 
-  virtual void endLumiAnalyze(DQMStore::IGetter&) {}
-  virtual void endJobAnalyze(DQMStore::IGetter&) {}
+  virtual void endLumiAnalyze(DQMStore::IGetter &) {}
+  virtual void endJobAnalyze(DQMStore::IGetter &) {}
 
-  void setup(DQMStore::IBooker&);
+  void setup(DQMStore::IBooker &);
 
-  template<typename T> T* getHisto(MonitorElement*, bool = false, T* = 0) const;
+  template <typename T>
+  T *getHisto(MonitorElement *, bool = false, T * = 0) const;
 
- protected:
-  virtual void book(DQMStore::IBooker&) {}
+protected:
+  virtual void book(DQMStore::IBooker &) {}
 
   bool initialized_;
   std::string prefixME_;
   bool cloneME_;
   bool verbose_;
   bool debug_;
-
 };
 
-template<typename T>
-T*
-ESClient::getHisto(MonitorElement* _me, bool _clone/* = false*/, T* _current/* = 0*/) const
-{
-  if(!_me){
-    if(_clone) return _current;
-    else return nullptr;
+template <typename T>
+T *ESClient::getHisto(MonitorElement *_me, bool _clone /* = false*/,
+                      T *_current /* = 0*/) const {
+  if (!_me) {
+    if (_clone)
+      return _current;
+    else
+      return nullptr;
   }
 
-  TObject* obj(_me->getRootObject());
+  TObject *obj(_me->getRootObject());
 
-  if(!obj) return nullptr;
+  if (!obj)
+    return nullptr;
 
-  if(_clone){
+  if (_clone) {
     delete _current;
-    _current = dynamic_cast<T*>(obj->Clone(("ME " + _me->getName()).c_str()));
-    if(_current) _current->SetDirectory(nullptr);
+    _current = dynamic_cast<T *>(obj->Clone(("ME " + _me->getName()).c_str()));
+    if (_current)
+      _current->SetDirectory(nullptr);
     return _current;
-  }
-  else
-    return dynamic_cast<T*>(obj);
+  } else
+    return dynamic_cast<T *>(obj);
 }
 
 #endif // ESClient_H
-
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h
@@ -7,43 +7,41 @@
 #include "TH2F.h"
 
 class ESIntegrityClient : public ESClient {
- public:
-
+public:
   /// Constructor
-  ESIntegrityClient(const edm::ParameterSet& ps);
-  
+  ESIntegrityClient(const edm::ParameterSet &ps);
+
   /// Destructor
   ~ESIntegrityClient() override;
-  
+
   /// Analyze
-  void endLumiAnalyze(DQMStore::IGetter&) override;
-  
- private:
-  void book(DQMStore::IBooker&) override;
-  
-  int fed_[2][2][40][40];  
-  int kchip_[2][2][40][40];  
-  int fiber_[2][2][40][40];  
+  void endLumiAnalyze(DQMStore::IGetter &) override;
+
+private:
+  void book(DQMStore::IBooker &) override;
+
+  int fed_[2][2][40][40];
+  int kchip_[2][2][40][40];
+  int fiber_[2][2][40][40];
   int fedStatus_[56];
   int fiberStatus_[56][36];
   int syncStatus_[56];
   int slinkCRCStatus_[56];
 
-  MonitorElement* meFED_[2][2];
-  MonitorElement* meKCHIP_[2][2];
+  MonitorElement *meFED_[2][2];
+  MonitorElement *meKCHIP_[2][2];
 
-  TH1F *hFED_;  
+  TH1F *hFED_;
   TH2F *hFiberOff_;
   TH2F *hFiberBadStatus_;
   TH2F *hKF1_;
   TH2F *hKF2_;
   TH1F *hKBC_;
-  TH1F *hKEC_; 
+  TH1F *hKEC_;
   TH1F *hL1ADiff_;
   TH1F *hBXDiff_;
   TH1F *hOrbitNumberDiff_;
-  TH1F *hSLinkCRCErr_; 
-
+  TH1F *hSLinkCRCErr_;
 };
 
 #endif
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h
@@ -11,27 +11,26 @@
 // class decleration
 //
 
-class ESPedestalClient : public ESClient{
-   public:
-   ESPedestalClient(const edm::ParameterSet&);
-   ~ESPedestalClient() override;
-   void endJobAnalyze(DQMStore::IGetter&) override;
+class ESPedestalClient : public ESClient {
+public:
+  ESPedestalClient(const edm::ParameterSet &);
+  ~ESPedestalClient() override;
+  void endJobAnalyze(DQMStore::IGetter &) override;
 
-   private:
-   void book(DQMStore::IBooker&) override;
+private:
+  void book(DQMStore::IBooker &) override;
 
-   bool fitPedestal_;
+  bool fitPedestal_;
 
-   MonitorElement *hPed_[2][2][40][40];
-   MonitorElement *hTotN_[2][2][40][40];
+  MonitorElement *hPed_[2][2][40][40];
+  MonitorElement *hTotN_[2][2][40][40];
 
-   TF1* fg_;
-
-   std::vector<int> senZ_;
-   std::vector<int> senP_;
-   std::vector<int> senX_;
-   std::vector<int> senY_;
+  TF1 *fg_;
 
+  std::vector<int> senZ_;
+  std::vector<int> senP_;
+  std::vector<int> senX_;
+  std::vector<int> senY_;
 };
 
-#endif  //ESPedestalClient_H
+#endif // ESPedestalClient_H
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h
@@ -5,26 +5,25 @@
 
 class ESSummaryClient : public ESClient {
 
-   public:
+public:
+  /// Constructor
+  ESSummaryClient(const edm::ParameterSet &ps);
 
-      /// Constructor
-      ESSummaryClient(const edm::ParameterSet& ps);
+  /// Destructor
+  ~ESSummaryClient() override;
 
-      /// Destructor
-      ~ESSummaryClient() override;
+  /// Analyze
+  void endLumiAnalyze(DQMStore::IGetter &) override;
+  void endJobAnalyze(DQMStore::IGetter &) override;
 
-      /// Analyze
-      void endLumiAnalyze(DQMStore::IGetter&) override;
-      void endJobAnalyze(DQMStore::IGetter&) override;
+private:
+  void book(DQMStore::IBooker &) override;
 
- private:
-      void book(DQMStore::IBooker&) override;
+  void fillReportSummary(DQMStore::IGetter &);
 
-      void fillReportSummary(DQMStore::IGetter&);
-
-      MonitorElement* meReportSummary_;
-      MonitorElement* meReportSummaryContents_[2][2];
-      MonitorElement* meReportSummaryMap_;
+  MonitorElement *meReportSummary_;
+  MonitorElement *meReportSummaryContents_[2][2];
+  MonitorElement *meReportSummaryMap_;
 };
 
 #endif
diff --git a/DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h b/DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h
@@ -7,26 +7,27 @@ class ESClient;
 
 class EcalPreshowerMonitorClient : public DQMEDHarvester {
 
- public:
-
-  EcalPreshowerMonitorClient(const edm::ParameterSet&);
+public:
+  EcalPreshowerMonitorClient(const edm::ParameterSet &);
   ~EcalPreshowerMonitorClient() override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions&);
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
+
+private:
+  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &,
+                             const edm::LuminosityBlock &,
+                             const edm::EventSetup &) override;
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
- private:
-
-  void dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter&, const edm::LuminosityBlock &, const edm::EventSetup &) override;
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
-
   // ----------member data ---------------------------
   bool debug_;
   bool verbose_;
-
-  std::vector<ESClient*> clients_;
 
-  // Data members existed below could not have been used in any way, yet was consuming O(100kB) of memory.
-  // Removed together with htmlOutput, which was a private function that was not called from anywhere. (yiiyama, Sep 18 2014)
+  std::vector<ESClient *> clients_;
+
+  // Data members existed below could not have been used in any way, yet was
+  // consuming O(100kB) of memory. Removed together with htmlOutput, which was a
+  // private function that was not called from anywhere. (yiiyama, Sep 18 2014)
 };
 
 #endif
diff --git a/DQM/EcalPreshowerMonitorClient/src/ESClient.cc b/DQM/EcalPreshowerMonitorClient/src/ESClient.cc
@@ -2,19 +2,16 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-ESClient::ESClient(edm::ParameterSet const& _ps) :
-  initialized_(false),
-  prefixME_(_ps.getUntrackedParameter<std::string>("prefixME")),
-  cloneME_(_ps.getUntrackedParameter<bool>("cloneME")),
-  verbose_(_ps.getUntrackedParameter<bool>("verbose")),
-  debug_(_ps.getUntrackedParameter<bool>("debug"))
-{
-}
+ESClient::ESClient(edm::ParameterSet const &_ps)
+    : initialized_(false),
+      prefixME_(_ps.getUntrackedParameter<std::string>("prefixME")),
+      cloneME_(_ps.getUntrackedParameter<bool>("cloneME")),
+      verbose_(_ps.getUntrackedParameter<bool>("verbose")),
+      debug_(_ps.getUntrackedParameter<bool>("debug")) {}
 
-void
-ESClient::setup(DQMStore::IBooker& _ibooker)
-{
-  if(initialized_) return;
+void ESClient::setup(DQMStore::IBooker &_ibooker) {
+  if (initialized_)
+    return;
   book(_ibooker);
   initialized_ = true;
 }