[DB] Changes suggested by new llvm18 clang-format

cms-sw · Sep 5, 2024 · 7ef3d00 · 7ef3d00
1 parent 15ea9bb
commit 7ef3d00
Show file tree

Hide file tree

Showing 116 changed files with 487 additions and 487 deletions.
diff --git a/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h b/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h
@@ -19,8 +19,8 @@
 
 class HcalChannelId {
 public:
-  HcalChannelId(){};
-  ~HcalChannelId(){};
+  HcalChannelId() {}
+  ~HcalChannelId() {}
 
   int eta, phi, depth;
   std::string subdetector;
@@ -30,8 +30,8 @@ class HcalChannelId {
 
 class HcalQIECaps {
 public:
-  HcalQIECaps(){};
-  ~HcalQIECaps(){};
+  HcalQIECaps() {}
+  ~HcalQIECaps() {}
 
   // cap0 offset x 4, cap1 offset x 4...
   // cap0 slope  x 4, cap1 slope  x 4...

diff --git a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h
@@ -30,8 +30,8 @@
 
 class LMapRow {
 public:
-  LMapRow(){};
-  ~LMapRow(){};
+  LMapRow() {}
+  ~LMapRow() {}
 
   int side;
   int eta, phi, dphi, depth;
@@ -55,8 +55,8 @@ class LMapRow {
 
 class LMapDetId {
 public:
-  LMapDetId(){};
-  ~LMapDetId(){};
+  LMapDetId() {}
+  ~LMapDetId() {}
 
   int side;
   int eta, phi, depth;
@@ -110,7 +110,7 @@ class EMap {
       zdc_channel = 0;
       zdc_section = "UNKNOWN";
     }
-    ~EMapRow(){};
+    ~EMapRow() {}
 
     bool operator<(const EMapRow& other) const;
 

diff --git a/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc b/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc
@@ -49,7 +49,7 @@
 class HcalLutAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit HcalLutAnalyzer(const edm::ParameterSet&);
-  ~HcalLutAnalyzer() override{};
+  ~HcalLutAnalyzer() override {}
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:

diff --git a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h
@@ -33,17 +33,17 @@
  *  The user can optionally implement the following methods 
  *
  *    //Will be called at the beginning of the job
- *    virtual void algoBeginJob(const edm::EventSetup&){};
+ *    virtual void algoBeginJob(const edm::EventSetup&){}
  *    //Will be called at the beginning of each run in the job
- *    virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){};
+ *    virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){}
  *    //Will be called at the beginning of each luminosity block in the run
- *    virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){};
+ *    virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}
  *    //Will be called at every event
- *    virtual void algoAnalyze(const edm::Event&, const edm::EventSetup&){};
+ *    virtual void algoAnalyze(const edm::Event&, const edm::EventSetup&){}
  *    //Will be called at the end of each run in the job
- *    virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){};
+ *    virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){}
  *    //Will be called at the end of the job
- *    virtual void algoEndJob(){};
+ *    virtual void algoEndJob(){}
  *
  *  where he can access information needed to build his object. For instance, if
  *  he is computing a calibration that is computed as the mean of a certain
@@ -202,17 +202,17 @@ class ConditionDBWriter
   // Optional methods that may be implemented (technically "overridden") in the derived classes if needed
 
   //Will be called at the beginning of the job
-  virtual void algoBeginJob(const edm::EventSetup &){};
+  virtual void algoBeginJob(const edm::EventSetup &) {}
   //Will be called at the beginning of each run in the job
-  virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){};
+  virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &) {}
   //Will be called at the beginning of each luminosity block in the run
-  virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){};
+  virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {}
   //Will be called at every event
-  virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &){};
+  virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &) {}
   //Will be called at the end of each run in the job
-  virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){};
+  virtual void algoEndRun(const edm::Run &, const edm::EventSetup &) {}
   //Will be called at the end of the job
-  virtual void algoEndJob(){};
+  virtual void algoEndJob() {}
 
   void beginJob() override {}
 
@@ -268,7 +268,7 @@ class ConditionDBWriter
     }
   }
 
-  virtual void algoEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){};
+  virtual void algoEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {}
 
   void endRun(const edm::Run &run, const edm::EventSetup &es) override {
     edm::LogInfo("ConditionDBWriter") << "endRun";

diff --git a/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc b/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc
@@ -29,8 +29,8 @@ class PCLMetadataWriter : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   ~PCLMetadataWriter() override = default;
 
   // Operations
-  void analyze(const edm::Event &, const edm::EventSetup &) override{};
-  void beginRun(const edm::Run &, const edm::EventSetup &) override{};
+  void analyze(const edm::Event &, const edm::EventSetup &) override {}
+  void beginRun(const edm::Run &, const edm::EventSetup &) override {}
   void endRun(const edm::Run &, const edm::EventSetup &) override;
 
 protected:

diff --git a/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h b/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h
@@ -1100,8 +1100,8 @@ namespace AlignmentPI {
             edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << coord << std::endl;
             break;
         }  // switch on the coordinate
-      }    // check on the same detID
-    }      // loop on the components
+      }  // check on the same detID
+    }  // loop on the components
   }
 
   /*--------------------------------------------------------------------*/
@@ -1181,7 +1181,7 @@ namespace AlignmentPI {
         }
 
       }  // if it's the same detid
-    }    // loop on detids
+    }  // loop on detids
   }
 
   /*--------------------------------------------------------------------*/

diff --git a/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc
@@ -87,8 +87,8 @@ namespace {
             // to be used to fill the histogram
             fillWithValue(sqrt(errMatrix[indices.first][indices.second]) * AlignmentPI::cmToUm);
           }  // loop on the vector of modules
-        }    // payload
-      }      // iovs
+        }  // payload
+      }  // iovs
       return true;
     }  // fill
   };
@@ -430,7 +430,7 @@ namespace {
           APE_spectraByRegion[hash]->Fill(sqrt(errMatrix[indices.first][indices.second]) * AlignmentPI::cmToUm);
 
         }  // loop on the coordinate indices
-      }    // loop over detIds
+      }  // loop over detIds
 
       // plotting section
 

diff --git a/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc
@@ -1143,8 +1143,8 @@ namespace {
               edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << myCoord << std::endl;
               break;
           }  // switch on the coordinate
-        }    // check on the same detID
-      }      // loop on the components
+        }  // check on the same detID
+      }  // loop on the components
     }
   };
 
@@ -1215,7 +1215,7 @@ namespace {
             edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << coord << std::endl;
             break;
         }  // switch on the coordinate (only X,Y,Z are interesting)
-      }    // ends loop on the alignments
+      }  // ends loop on the alignments
 
       edm::LogInfo("TrackerAlignment_PayloadInspector") << "barycenter (" << barycenter << ")/n. modules (" << nmodules
                                                         << ") =  " << barycenter / nmodules << std::endl;

diff --git a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc
@@ -77,7 +77,7 @@ namespace {
           }
 
         }  // payload
-      }    // iovs
+      }  // iovs
       return true;
     }  // fill
   };
@@ -135,7 +135,7 @@ namespace {
           summaries[nPar]->Fill(par);
           nPar++;
         }  // ends loop on the parameters
-      }    // ends loop on the item vector
+      }  // ends loop on the item vector
 
       TLatex t1;
 
@@ -603,8 +603,8 @@ namespace {
               surfDefMap[f_entry.first] = delta;
             }
           }  // if not phase-0
-        }    // loop on the last payload map
-      }      // loop on the first payload map
+        }  // loop on the last payload map
+      }  // loop on the first payload map
 
       //=========================
 
@@ -772,8 +772,8 @@ namespace {
               surfDefMap[f_entry.first] = delta;
             }
           }  // if not phase-0
-        }    // loop on the last payload map
-      }      // loop on the first payload map
+        }  // loop on the last payload map
+      }  // loop on the first payload map
 
       //=========================
 

diff --git a/CondCore/CondDB/src/CoralMsgReporter.h b/CondCore/CondDB/src/CoralMsgReporter.h
@@ -34,7 +34,7 @@ namespace cond {
       CoralMsgReporter();
 
       /// Destructor
-      ~CoralMsgReporter() override{};
+      ~CoralMsgReporter() override {}
 
       /// Release reference to reporter
       void release() override { delete this; }

diff --git a/CondCore/CondDB/src/blowfish.h b/CondCore/CondDB/src/blowfish.h
@@ -31,7 +31,7 @@ typedef unsigned int uInt32;
 #endif
 
 #ifndef S_ISREG
-#define S_ISREG(x) (((x)&S_IFMT) == S_IFREG)
+#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
 #endif
 
 #define MAXKEYBYTES 56 /* 448 bits */

diff --git a/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc
@@ -70,7 +70,7 @@ namespace {
               }
             }
           }  // validHashIndex
-      }      // payload
+      }  // payload
 
       gStyle->SetOptStat(0);
       gStyle->SetPalette(1);
@@ -189,9 +189,9 @@ namespace {
                   }
                 }
               }  // 2nd IOV
-            }    // validHashIndex
-        }        // payload
-      }          // loop over IOVs
+            }  // validHashIndex
+        }  // payload
+      }  // loop over IOVs
 
       gStyle->SetOptStat(0);
       gStyle->SetPalette(1);

diff --git a/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc
@@ -66,7 +66,7 @@ namespace {
                 valmin = value;
             }
           }  // validHashIndex
-      }      // payload
+      }  // payload
 
       gStyle->SetOptStat(0);
       gStyle->SetPalette(1);
@@ -180,9 +180,9 @@ namespace {
                     valmin = diff;
                 }
               }  // 2nd IOV
-            }    // validHashIndex
-        }        // payload
-      }          // loop over IOVs
+            }  // validHashIndex
+        }  // payload
+      }  // loop over IOVs
 
       gStyle->SetOptStat(0);
       gStyle->SetPalette(1);
@@ -228,7 +228,7 @@ namespace {
       canvas.SaveAs(ImageName.c_str());
       return true;
     }  // fill method
-  };   // class ESIntercalibConstantsDiffBase
+  };  // class ESIntercalibConstantsDiffBase
   using ESIntercalibConstantsDiffOneTag = ESIntercalibConstantsDiffBase<cond::payloadInspector::SINGLE_IOV, 1>;
   using ESIntercalibConstantsDiffTwoTags = ESIntercalibConstantsDiffBase<cond::payloadInspector::SINGLE_IOV, 2>;
 

diff --git a/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc
@@ -25,7 +25,7 @@ namespace {
     MIN_IPHI = 1,
     MAX_IETA = 85,
     MAX_IPHI = 360
-  };                                                            // barrel (EB) lower and upper bounds on eta and phi
+  };  // barrel (EB) lower and upper bounds on eta and phi
   enum { IX_MIN = 1, IY_MIN = 1, IX_MAX = 100, IY_MAX = 100 };  // endcaps (EE) lower and upper bounds on x and y
 
   /*****************************************
@@ -257,7 +257,7 @@ namespace {
       canvas.SaveAs(ImageName.c_str());
       return true;
     }  // fill method
-  };   // class EcalAlignmentDiffBase
+  };  // class EcalAlignmentDiffBase
   using EcalAlignmentDiffOneTag = EcalAlignmentDiffBase<cond::payloadInspector::SINGLE_IOV, 1>;
   using EcalAlignmentDiffTwoTags = EcalAlignmentDiffBase<cond::payloadInspector::SINGLE_IOV, 2>;
 

diff --git a/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc
@@ -64,7 +64,7 @@ namespace {
             ebmap_coarse->Fill(phi, eta);
           }
         }  // loop over cellid
-      }    // if payload.get()
+      }  // if payload.get()
       else
         return false;
 
@@ -181,7 +181,7 @@ namespace {
                   }
                 }
               }  // validDetId
-      }          // payload
+      }  // payload
 
       gStyle->SetOptStat(0);
       //set the background color to white
@@ -337,7 +337,7 @@ namespace {
               }
             }
           }  // loop over cellid
-        }    // if payload.get()
+        }  // if payload.get()
         else
           return false;
       }  // loop over IOV's
@@ -489,11 +489,11 @@ namespace {
                         eecount++;
                         eemap_coarse->Fill(ix + IX_MAX - 1, iy - 1, tmp3);
                       }  // z side
-                    }    //  any difference ?
-                  }      //   2nd IOV, fill the plots
-                }        //    validDetId
-        }                //     get the payload
-      }                  //      loop over payloads
+                    }  //  any difference ?
+                  }  //   2nd IOV, fill the plots
+                }  //    validDetId
+        }  //     get the payload
+      }  //      loop over payloads
 
       gStyle->SetOptStat(0);
       //set the background color to white