Apply code-format patch

Author: ywkao

DQMServices/Core/interface/DQMStore.h

@@ -36,7 +36,7 @@ namespace dqm {
       virtual ~NavigatorBase() {}
 
     protected:
-      NavigatorBase(){};
+      NavigatorBase() {};
       std::string cwd_ = "";
     };
 

DQMServices/Core/interface/MonitorElement.h

@@ -57,7 +57,7 @@ namespace dqm {
     static const int STATUS_OK = 100;   //< Test was succesful.
     static const int WARNING = 200;     //< Test had some problems.
     static const int ERROR = 300;       //< Test has failed.
-  }                                     // namespace qstatus
+  }  // namespace qstatus
 
   namespace me_util {
     using Channel = DQMChannel;

DQMServices/Demo/test/TestDQMEDAnalyzer.cc

@@ -34,7 +34,8 @@ class BookerFiller {
       mes_2D.push_back(ibooker.book2D("th2f" + num, "2D Float Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
       mes_2D.push_back(ibooker.book2S("th2s" + num, "2D Short Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
       mes_2D.push_back(ibooker.book2DD("th2d" + num, "2D Double Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
-      mes_2D.push_back(ibooker.book2DPoly("th2poly" + num, "2D Polygonal Double Histogram " + num, -0.5, 100.5, -0.5, 10.5));
+      mes_2D.push_back(
+          ibooker.book2DPoly("th2poly" + num, "2D Polygonal Double Histogram " + num, -0.5, 100.5, -0.5, 10.5));
       mes_2D.push_back(ibooker.book2I("th2i" + num, "2D Integer Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
       mes_2D.push_back(
           ibooker.bookProfile("tprofile" + num, "1D Profile Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
@@ -58,7 +59,8 @@ class BookerFiller {
         mes_2D.push_back(ibooker.book2D("th2f" + num, "2D Float Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
         mes_2D.push_back(ibooker.book2S("th2s" + num, "2D Short Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
         mes_2D.push_back(ibooker.book2DD("th2d" + num, "2D Double Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
-        mes_2D.push_back(ibooker.book2DPoly("th2poly" + num, "2D Polygonal Double Histogram " + num, -0.5, 100.5, -0.5, 10.5));
+        mes_2D.push_back(
+            ibooker.book2DPoly("th2poly" + num, "2D Polygonal Double Histogram " + num, -0.5, 100.5, -0.5, 10.5));
         mes_2D.push_back(ibooker.book2I("th2i" + num, "2D Integer Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));
         mes_2D.push_back(
             ibooker.bookProfile("tprofile" + num, "1D Profile Histogram " + num, 101, -0.5, 100.5, 11, -0.5, 10.5));

DataFormats/Histograms/interface/MEtoEDMFormat.h

@@ -122,15 +122,15 @@ class MEtoEDM {
         if (MEtoEdmObject[j].object.Merge(&list) == -1) {
           std::cout << "ERROR MEtoEDM::mergeProducts(): merge failed for '" << name << "'" << std::endl;
         }
-      // } else if (MEtoEdmObject[j].object.IsA()->InheritsFrom("TH2Poly")) {
-      //   // ad-hoc addition because no matching function for call to 'TH2Poly::Add(const TH2Poly*)'
-      //   int nbins = MEtoEdmObject[j].object.GetNcells() - 9;
-      //   for(int ibin=1; ibin<nbins+1; ++ibin) {
-      //       double value1 = MEtoEdmObject[j].object.GetBinContent(ibin);
-      //       double value2 = newMEtoEDMObject[i].object.GetBinContent(ibin);
-      //       double total = value1 + value2;
-      //       MEtoEdmObject[j].object.SetBinContent(ibin, total);
-      //   }
+        // } else if (MEtoEdmObject[j].object.IsA()->InheritsFrom("TH2Poly")) {
+        //   // ad-hoc addition because no matching function for call to 'TH2Poly::Add(const TH2Poly*)'
+        //   int nbins = MEtoEdmObject[j].object.GetNcells() - 9;
+        //   for(int ibin=1; ibin<nbins+1; ++ibin) {
+        //       double value1 = MEtoEdmObject[j].object.GetBinContent(ibin);
+        //       double value2 = newMEtoEDMObject[i].object.GetBinContent(ibin);
+        //       double total = value1 + value2;
+        //       MEtoEdmObject[j].object.SetBinContent(ibin, total);
+        //   }
       } else {
         // this value is also in the new container: add the two
         if (MEtoEdmObject[j].object.GetNbinsX() == newMEtoEDMObject[i].object.GetNbinsX() &&
@@ -394,11 +394,11 @@ inline bool MEtoEDM<TH2Poly>::mergeProduct(const MEtoEDM<TH2Poly> &newMEtoEDM) {
 
       // ad-hoc addition because no matching function for call to 'TH2Poly::Add(const TH2Poly*)'
       int nbins = MEtoEdmObject[j].object.GetNcells() - 9;
-      for(int ibin=1; ibin<nbins+1; ++ibin) {
-          double value1 = MEtoEdmObject[j].object.GetBinContent(ibin);
-          double value2 = newMEtoEDMObject[i].object.GetBinContent(ibin);
-          double total = value1 + value2;
-          MEtoEdmObject[j].object.SetBinContent(ibin, total);
+      for (int ibin = 1; ibin < nbins + 1; ++ibin) {
+        double value1 = MEtoEdmObject[j].object.GetBinContent(ibin);
+        double value2 = newMEtoEDMObject[i].object.GetBinContent(ibin);
+        double total = value1 + value2;
+        MEtoEdmObject[j].object.SetBinContent(ibin, total);
       }
     }
   }