Merge pull request #45919 from smuzaffar/alca-db-l1-llvm18-clang-format

cmsbuild · web-flow · commit 865504bc7ecc · 2024-09-11T20:07:55.000+02:00
[ALCA-DB-L1] Changes suggested by new llvm18 clang-format
diff --git a/CondFormats/L1TObjects/interface/CaloParams.h b/CondFormats/L1TObjects/interface/CaloParams.h
@@ -94,8 +94,7 @@ namespace l1t {
             maskE_(0),
             maskSum_(0),
             maskRatio_(0),
-            doEncoding_(false) { /* no-op */
-      }
+            doEncoding_(false) { /* no-op */ }
 
       COND_SERIALIZABLE;
     };
@@ -150,8 +149,7 @@ namespace l1t {
             maxPtHOverEIsolation_(0),
             isoAreaNrTowersEta_(0),
             isoAreaNrTowersPhi_(0),
-            isoVetoNrTowersPhi_(0) { /* no-op */
-      }
+            isoVetoNrTowersPhi_(0) { /* no-op */ }
 
       COND_SERIALIZABLE;
     };
@@ -204,8 +202,7 @@ namespace l1t {
             isoEtaMax_(0),
             isoAreaNrTowersEta_(0),
             isoAreaNrTowersPhi_(0),
-            isoVetoNrTowersPhi_(0) { /* no-op */
-      }
+            isoVetoNrTowersPhi_(0) { /* no-op */ }
 
       COND_SERIALIZABLE;
     };
@@ -221,8 +218,7 @@ namespace l1t {
       // Et threshold on neighbouring towers/regions
       double neighbourThreshold_;
 
-      JetParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0) { /* no-op */
-      }
+      JetParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0) { /* no-op */ }
 
       COND_SERIALIZABLE;
     };
diff --git a/CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h b/CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h
@@ -63,9 +63,7 @@ class L1GtEnergySumTemplate : public L1GtCondition {
     unsigned long long phiRange1Word;
 
     // make sure all objects (esp. the bool) are properly initialised to avoid problems with serialisation:
-    ObjectParameter() : etThreshold(0), energyOverflow(false), phiRange0Word(0), phiRange1Word(0) { /*nop*/
-      ;
-    };
+    ObjectParameter() : etThreshold(0), energyOverflow(false), phiRange0Word(0), phiRange1Word(0) { /*nop*/ ; }
 
     COND_SERIALIZABLE;
   };
diff --git a/CondFormats/L1TObjects/interface/L1MuGMTScales.h b/CondFormats/L1TObjects/interface/L1MuGMTScales.h
@@ -170,17 +170,17 @@ class L1MuGMTScales {
   };
 
   /// destructor
-  virtual ~L1MuGMTScales(){
-      //     for (int i=0; i<4; i++) {
-      //       delete m_ReducedEtaScale[i];
-      //       delete m_OvlEtaScale[i];
-      //     }
-      //     for (int i=0; i<6; i++) {
-      //       delete m_DeltaEtaScale[i];
-      //     }
-
-      //     delete m_DeltaPhiScale;
-      //     delete m_CaloEtaScale;
+  virtual ~L1MuGMTScales() {
+    //     for (int i=0; i<4; i++) {
+    //       delete m_ReducedEtaScale[i];
+    //       delete m_OvlEtaScale[i];
+    //     }
+    //     for (int i=0; i<6; i++) {
+    //       delete m_DeltaEtaScale[i];
+    //     }
+
+    //     delete m_DeltaPhiScale;
+    //     delete m_CaloEtaScale;
   };
 
   /// get the recuced eta scale for matching in the overlap region (4 bit); isys = 0(DT), 1(bRPC), 2(CSC), 3(fwdRPC)
diff --git a/CondFormats/L1TObjects/interface/L1MuPacking.h b/CondFormats/L1TObjects/interface/L1MuPacking.h
@@ -35,7 +35,7 @@
 
 class L1MuPacking {
 public:
-  virtual ~L1MuPacking(){};
+  virtual ~L1MuPacking() {}
 
   /// get the sign from the packed notation (0=positive, 1=negative)
   virtual int signFromPacked(unsigned packed) const = 0;
@@ -150,8 +150,8 @@ class L1MuSignedPackingGeneric : public L1MuPacking {
 class L1MuPseudoSignedPacking : public L1MuPacking {
 public:
   L1MuPseudoSignedPacking() {}
-  ~L1MuPseudoSignedPacking() override{};
-  L1MuPseudoSignedPacking(unsigned int nbits) : m_nbits(nbits){};
+  ~L1MuPseudoSignedPacking() override {}
+  L1MuPseudoSignedPacking(unsigned int nbits) : m_nbits(nbits) {}
 
   /// get the (pseudo-)sign from the packed notation (0=positive, 1=negative)
   int signFromPacked(unsigned packed) const override { return (packed & (1 << (m_nbits - 1))) ? 1 : 0; };
diff --git a/CondFormats/L1TObjects/interface/L1MuScale.h b/CondFormats/L1TObjects/interface/L1MuScale.h
@@ -138,8 +138,8 @@ class L1MuBinnedScale : public L1MuScale {
   };
 
   /// destructor
-  ~L1MuBinnedScale() override{
-      //    delete m_packing;
+  ~L1MuBinnedScale() override {
+    //    delete m_packing;
   };
 
   /// get the center of bin represented by packed
@@ -276,8 +276,8 @@ class L1MuSymmetricBinnedScale : public L1MuScale {
   };
 
   /// destructor
-  ~L1MuSymmetricBinnedScale() override{
-      //    delete m_packing;
+  ~L1MuSymmetricBinnedScale() override {
+    //    delete m_packing;
   };
 
   /// get the center of bin represented by packed
diff --git a/CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h b/CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h
@@ -53,7 +53,7 @@ class L1MuTriggerPtScale {
   };
 
   /// destructor
-  virtual ~L1MuTriggerPtScale(){};
+  virtual ~L1MuTriggerPtScale() {}
 
   /// get the Pt scale
   const L1MuScale* getPtScale() const { return &m_PtScale; };
diff --git a/CondFormats/L1TObjects/interface/L1MuTriggerScales.h b/CondFormats/L1TObjects/interface/L1MuTriggerScales.h
@@ -145,13 +145,13 @@ class L1MuTriggerScales {
   };
 
   /// destructor
-  virtual ~L1MuTriggerScales(){
-      //     for (int i=0; i<4; i++)
-      //       delete m_RegionalEtaScale[i];
+  virtual ~L1MuTriggerScales() {
+    //     for (int i=0; i<4; i++)
+    //       delete m_RegionalEtaScale[i];
 
-      //     delete m_GMTEtaScale;
-      //     delete m_PhiScale;
-      //     delete m_PtScale;
+    //     delete m_GMTEtaScale;
+    //     delete m_PhiScale;
+    //     delete m_PtScale;
   };
 
   /// get the regioanl muon trigger eta scale, isys = 0(DT), 1(bRPC), 2(CSC), 3(fwdRPC)
diff --git a/CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h b/CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h
@@ -29,7 +29,7 @@ class L1TUtmAlgorithm {
         index_(),
         module_id_(),
         module_index_(),
-        version(0){};
+        version(0) {}
   L1TUtmAlgorithm(std::string name,
                   std::string expression,
                   std::string expression_in_condition,
@@ -45,7 +45,7 @@ class L1TUtmAlgorithm {
         index_(index),
         module_id_(module_id),
         module_index_(module_index),
-        version(ver){};
+        version(ver) {}
 
   L1TUtmAlgorithm(const tmeventsetup::esAlgorithm& esAlg)
       : L1TUtmAlgorithm(esAlg.getName(),
@@ -56,7 +56,7 @@ class L1TUtmAlgorithm {
                         esAlg.getModuleId(),
                         esAlg.getModuleIndex(),
                         0  //There is no version retrieval in esAlgorithm. However, it seems pretty hard coded to 0
-        ){};
+        ) {};
 
   virtual ~L1TUtmAlgorithm() = default;
 
diff --git a/CondFormats/L1TObjects/interface/L1TUtmBin.h b/CondFormats/L1TObjects/interface/L1TUtmBin.h
@@ -23,12 +23,12 @@ class L1TUtmBin {
       : hw_index(std::numeric_limits<unsigned int>::max()),
         minimum(std::numeric_limits<double>::min()),
         maximum(std::numeric_limits<double>::max()),
-        version(0){};
+        version(0) {}
 
   L1TUtmBin(const unsigned int id, const double min, const double max)
-      : hw_index(id), minimum(min), maximum(max), version(0){};
+      : hw_index(id), minimum(min), maximum(max), version(0) {}
 
-  L1TUtmBin(const tmeventsetup::esBin& bin) : L1TUtmBin(bin.hw_index, bin.minimum, bin.maximum){};
+  L1TUtmBin(const tmeventsetup::esBin& bin) : L1TUtmBin(bin.hw_index, bin.minimum, bin.maximum) {}
 
   operator tmeventsetup::esBin() const { return tmeventsetup::esBin(hw_index, minimum, maximum); }
 
diff --git a/CondFormats/L1TObjects/interface/L1TUtmCondition.h b/CondFormats/L1TObjects/interface/L1TUtmCondition.h
@@ -24,10 +24,10 @@
  */
 class L1TUtmCondition {
 public:
-  L1TUtmCondition() : name_(), type_(-9999), objects_(), cuts_(), version(0){};
+  L1TUtmCondition() : name_(), type_(-9999), objects_(), cuts_(), version(0) {}
   L1TUtmCondition(
       std::string name, int type, std::vector<L1TUtmObject> objects, std::vector<L1TUtmCut> cuts, unsigned int vers)
-      : name_(name), type_(type), objects_(objects), cuts_(cuts), version(vers){};
+      : name_(name), type_(type), objects_(objects), cuts_(cuts), version(vers) {}
 
   L1TUtmCondition(const tmeventsetup::esCondition& esCond)
       : name_(esCond.getName()), type_(esCond.getType()), version(0) {
diff --git a/CondFormats/L1TObjects/interface/L1TUtmCut.h b/CondFormats/L1TObjects/interface/L1TUtmCut.h
@@ -22,7 +22,7 @@
  */
 class L1TUtmCut {
 public:
-  L1TUtmCut() : name_(), object_type_(), cut_type_(), minimum_(), maximum_(), data_(), key_(), version(0){};
+  L1TUtmCut() : name_(), object_type_(), cut_type_(), minimum_(), maximum_(), data_(), key_(), version(0) {}
   L1TUtmCut(std::string name,
             int object_type,
             int cut_type,
@@ -38,7 +38,7 @@ class L1TUtmCut {
         maximum_(maximum),
         data_(data),
         key_(key),
-        version(vers){};
+        version(vers) {}
 
   L1TUtmCut(const tmeventsetup::esCut& esC)
       : L1TUtmCut(esC.getName(),
@@ -48,7 +48,7 @@ class L1TUtmCut {
                   L1TUtmCutValue(esC.getMaximum()),
                   esC.getData(),
                   esC.getKey(),
-                  0){};
+                  0) {};
 
   virtual ~L1TUtmCut() = default;
 
diff --git a/CondFormats/L1TObjects/interface/L1TUtmCutValue.h b/CondFormats/L1TObjects/interface/L1TUtmCutValue.h
@@ -19,8 +19,8 @@
  */
 struct L1TUtmCutValue {
   L1TUtmCutValue()
-      : value(std::numeric_limits<double>::max()), index(std::numeric_limits<unsigned int>::max()), version(0){};
-  L1TUtmCutValue(const tmeventsetup::esCutValue& esCV) : value(esCV.value), index(esCV.index), version(esCV.version){};
+      : value(std::numeric_limits<double>::max()), index(std::numeric_limits<unsigned int>::max()), version(0) {}
+  L1TUtmCutValue(const tmeventsetup::esCutValue& esCV) : value(esCV.value), index(esCV.index), version(esCV.version) {}
 
   virtual ~L1TUtmCutValue() = default;
 
diff --git a/CondFormats/L1TObjects/interface/L1TUtmObject.h b/CondFormats/L1TObjects/interface/L1TUtmObject.h
@@ -33,7 +33,7 @@ class L1TUtmObject {
         ext_signal_name_(),
         ext_channel_id_(std::numeric_limits<unsigned int>::max()),
         cuts_(),
-        version(0){};
+        version(0) {}
   L1TUtmObject(std::string name,
                int type,
                int comparison_operator,
@@ -51,7 +51,7 @@ class L1TUtmObject {
         ext_signal_name_(ext_signal_name),
         ext_channel_id_(ext_channel_id),
         cuts_(cuts),
-        version(vers){};
+        version(vers) {}
 
   L1TUtmObject(const tmeventsetup::esObject& esObj)
       : name_(esObj.getName()),
diff --git a/CondFormats/L1TObjects/interface/L1TUtmScale.h b/CondFormats/L1TObjects/interface/L1TUtmScale.h
@@ -24,7 +24,7 @@
  */
 class L1TUtmScale {
 public:
-  L1TUtmScale() : name_(), object_(), type_(), minimum_(), maximum_(), step_(), n_bits_(), bins_(), version(0){};
+  L1TUtmScale() : name_(), object_(), type_(), minimum_(), maximum_(), step_(), n_bits_(), bins_(), version(0) {}
 
   L1TUtmScale(std::string name,
               int object,
@@ -43,7 +43,7 @@ class L1TUtmScale {
         step_(step),
         n_bits_(n_bits),
         bins_(bins),
-        version(vers){};
+        version(vers) {}
 
   L1TUtmScale(const tmeventsetup::esScale& esSc)
       : name_(esSc.getName()),
diff --git a/CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h b/CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h
@@ -39,7 +39,7 @@ class L1TUtmTriggerMenu {
         uuid_firmware_(),
         scale_set_name_(),
         n_modules_(),
-        version(0){};
+        version(0) {}
   L1TUtmTriggerMenu(std::map<std::string, L1TUtmAlgorithm> algorithm_map,
                     std::map<std::string, L1TUtmCondition> condition_map,
                     std::map<std::string, L1TUtmScale> scale_map,
@@ -63,7 +63,7 @@ class L1TUtmTriggerMenu {
         uuid_firmware_(uuid_firmware),
         scale_set_name_(scale_set_name),
         n_modules_(n_modules),
-        version(ver_i){};
+        version(ver_i) {}
 
   L1TUtmTriggerMenu(const tmeventsetup::esTriggerMenu& esMenu)
       : external_map_(),        //These are null to my best knowledge
diff --git a/CondFormats/L1TObjects/src/L1RCTParameters.cc b/CondFormats/L1TObjects/src/L1RCTParameters.cc
@@ -132,7 +132,7 @@ unsigned short L1RCTParameters::calcTower(unsigned short rct_iphi, unsigned shor
     regionPhi = iphi % 2;
     // HF MAPPING, just regions now, don't need to worry about towers
     // just calling it "tower" for convenience
-    tower = (regionPhi)*4 + absIeta - 29;
+    tower = (regionPhi) * 4 + absIeta - 29;
   }
   return tower;
 }
