changing code format

saswatinandan · saswatinandan · commit 1d8ce7c01038 · 2025-09-29T09:04:55.000+02:00
diff --git a/DataFormats/SiStripCluster/interface/SiStripApproximateClusterCollection_v1.h b/DataFormats/SiStripCluster/interface/SiStripApproximateClusterCollection_v1.h
@@ -14,95 +14,94 @@
  * Please consult core software group if in doubt.
 **/
 namespace v1 {
-class SiStripApproximateClusterCollection {
-public:
-  // Helper classes to make creation and iteration easier
-  class Filler {
+  class SiStripApproximateClusterCollection {
   public:
-    void push_back(SiStripApproximateCluster_v1 const& cluster) { clusters_.push_back(cluster); }
+    // Helper classes to make creation and iteration easier
+    class Filler {
+    public:
+      void push_back(SiStripApproximateCluster_v1 const& cluster) { clusters_.push_back(cluster); }
 
-  private:
-    friend SiStripApproximateClusterCollection;
-    Filler(std::vector<SiStripApproximateCluster_v1>& clusters) : clusters_(clusters) {}
+    private:
+      friend SiStripApproximateClusterCollection;
+      Filler(std::vector<SiStripApproximateCluster_v1>& clusters) : clusters_(clusters) {}
 
-    std::vector<SiStripApproximateCluster_v1>& clusters_;
-  };
+      std::vector<SiStripApproximateCluster_v1>& clusters_;
+    };
 
-  class const_iterator;
-  class DetSet {
-  public:
-    using const_iterator = std::vector<SiStripApproximateCluster_v1>::const_iterator;
+    class const_iterator;
+    class DetSet {
+    public:
+      using const_iterator = std::vector<SiStripApproximateCluster_v1>::const_iterator;
 
-    unsigned int id() const { return std::accumulate(coll_->detIds_.cbegin(), coll_->detIds_.cbegin()+detIndex_+1, 0); }
+      unsigned int id() const {
+        return std::accumulate(coll_->detIds_.cbegin(), coll_->detIds_.cbegin() + detIndex_ + 1, 0);
+      }
 
-    void move(unsigned int clusBegin) const { clusBegin_ = clusBegin; }
-    const_iterator begin() const { return coll_->clusters_.begin() + clusBegin_; }
-    const_iterator cbegin() const { return begin(); }
-    const_iterator end() const { return coll_->clusters_.begin() + clusEnd_; }
-    const_iterator cend() const { return end(); }
+      void move(unsigned int clusBegin) const { clusBegin_ = clusBegin; }
+      const_iterator begin() const { return coll_->clusters_.begin() + clusBegin_; }
+      const_iterator cbegin() const { return begin(); }
+      const_iterator end() const { return coll_->clusters_.begin() + clusEnd_; }
+      const_iterator cend() const { return end(); }
+
+    private:
+      friend SiStripApproximateClusterCollection::const_iterator;
+      DetSet(SiStripApproximateClusterCollection const* coll, unsigned int detIndex)
+          : coll_(coll), detIndex_(detIndex), clusEnd_(coll->clusters_.size()) {}
+
+      SiStripApproximateClusterCollection const* const coll_;
+      unsigned int const detIndex_;
+      mutable unsigned int clusBegin_ = 0;
+      unsigned int const clusEnd_;
+    };
+
+    class const_iterator {
+    public:
+      DetSet operator*() const { return DetSet(coll_, index_); }
+
+      const_iterator& operator++() {
+        ++index_;
+        if (index_ == coll_->detIds_.size()) {
+          *this = const_iterator();
+        }
+        return *this;
+      }
 
-  private:
-    friend SiStripApproximateClusterCollection::const_iterator;
-    DetSet(SiStripApproximateClusterCollection const* coll, unsigned int detIndex)
-        : coll_(coll),
-          detIndex_(detIndex),
-          clusEnd_(coll->clusters_.size())
-          {}
-
-    SiStripApproximateClusterCollection const* const coll_;
-    unsigned int const detIndex_;
-    mutable unsigned int clusBegin_ = 0;
-    unsigned int const clusEnd_;
-  };
+      const_iterator operator++(int) {
+        const_iterator clone = *this;
+        ++(*this);
+        return clone;
+      }
 
-  class const_iterator {
-  public:
-    DetSet operator*() const { return DetSet(coll_, index_); }
+      bool operator==(const_iterator const& other) const { return coll_ == other.coll_ and index_ == other.index_; }
+      bool operator!=(const_iterator const& other) const { return not operator==(other); }
 
-    const_iterator& operator++() {
-      ++index_;
-      if (index_ == coll_->detIds_.size()) {
-        *this = const_iterator();
-      }
-      return *this;
-    }
+    private:
+      friend SiStripApproximateClusterCollection;
+      // default-constructed object acts as the sentinel
+      const_iterator() = default;
+      const_iterator(SiStripApproximateClusterCollection const* coll) : coll_(coll) {}
 
-    const_iterator operator++(int) {
-      const_iterator clone = *this;
-      ++(*this);
-      return clone;
-    }
+      SiStripApproximateClusterCollection const* coll_ = nullptr;
+      unsigned int index_ = 0;
+    };
 
-    bool operator==(const_iterator const& other) const { return coll_ == other.coll_ and index_ == other.index_; }
-    bool operator!=(const_iterator const& other) const { return not operator==(other); }
+    // Actual public interface
+    SiStripApproximateClusterCollection() = default;
 
-  private:
-    friend SiStripApproximateClusterCollection;
-    // default-constructed object acts as the sentinel
-    const_iterator() = default;
-    const_iterator(SiStripApproximateClusterCollection const* coll) : coll_(coll) {}
+    void reserve(std::size_t dets, std::size_t clusters);
+    Filler beginDet(unsigned int detId);
 
-    SiStripApproximateClusterCollection const* coll_ = nullptr;
-    unsigned int index_ = 0;
-  };
+    const_iterator begin() const { return clusters_.empty() ? end() : const_iterator(this); }
+    const_iterator cbegin() const { return begin(); }
+    const_iterator end() const { return const_iterator(); }
+    const_iterator cend() const { return end(); }
 
-  // Actual public interface
-  SiStripApproximateClusterCollection() = default;
-
-  void reserve(std::size_t dets, std::size_t clusters);
-  Filler beginDet(unsigned int detId);
-
-  const_iterator begin() const { return clusters_.empty() ? end() : const_iterator(this); }
-  const_iterator cbegin() const { return begin(); }
-  const_iterator end() const { return const_iterator(); }
-  const_iterator cend() const { return end(); }
-
-private:
-  // The detIds_ and beginIndices_ have one element for each Det. An
-  // element of beginIndices_ points to the first cluster of the Det
-  // in clusters_.
-  std::vector<unsigned int> detIds_;  // DetId for the Det
-  std::vector<SiStripApproximateCluster_v1> clusters_;
-};
-}
+  private:
+    // The detIds_ and beginIndices_ have one element for each Det. An
+    // element of beginIndices_ points to the first cluster of the Det
+    // in clusters_.
+    std::vector<unsigned int> detIds_;  // DetId for the Det
+    std::vector<SiStripApproximateCluster_v1> clusters_;
+  };
+}  // namespace v1
 #endif
diff --git a/DataFormats/SiStripCluster/interface/SiStripApproximateCluster_v1.h b/DataFormats/SiStripCluster/interface/SiStripApproximateCluster_v1.h
@@ -9,55 +9,51 @@ class SiStripApproximateCluster_v1 {
 public:
   SiStripApproximateCluster_v1() {}
 
-  explicit SiStripApproximateCluster_v1(cms_uint16_t compBarycenter,
-                                     cms_uint8_t width,
-                                     cms_uint8_t compavgCharge
-                                    )
-      : compBarycenter_(compBarycenter),
-        width_(width),
-        compavgCharge_(compavgCharge)
-        {}
+  explicit SiStripApproximateCluster_v1(cms_uint16_t compBarycenter, cms_uint8_t width, cms_uint8_t compavgCharge)
+      : compBarycenter_(compBarycenter), width_(width), compavgCharge_(compavgCharge) {}
 
   explicit SiStripApproximateCluster_v1(const SiStripCluster& cluster,
-                                     unsigned int maxNSat,
-                                     float hitPredPos,
-                                     float& previous_cluster,
-                                     unsigned int& module_length,
-                                     unsigned int& previous_module_length,
-                                     bool peakFilter);
+                                        unsigned int maxNSat,
+                                        float hitPredPos,
+                                        float& previous_cluster,
+                                        unsigned int& module_length,
+                                        unsigned int& previous_module_length,
+                                        bool peakFilter);
 
-  const cms_uint16_t compBarycenter() const {
-    return compBarycenter_;
-  }
+  const cms_uint16_t compBarycenter() const { return compBarycenter_; }
 
-  float barycenter(float previous_barycenter=0,
-                   unsigned int module_length=0, unsigned int previous_module_length=0) const {
+  float barycenter(float previous_barycenter = 0,
+                   unsigned int module_length = 0,
+                   unsigned int previous_module_length = 0) const {
     float _barycenter;
-    cms_uint16_t compBarycenter = (compBarycenter_&0x7FFF);
-    if (  previous_barycenter == -999 )
-      _barycenter = compBarycenter * maxBarycenter_/maxRange_;
+    cms_uint16_t compBarycenter = (compBarycenter_ & 0x7FFF);
+    if (previous_barycenter == -999)
+      _barycenter = compBarycenter * maxBarycenter_ / maxRange_;
     else {
-      _barycenter = ((compBarycenter * maxBarycenter_/maxRange_) - (module_length-previous_module_length)) + previous_barycenter;
+      _barycenter = ((compBarycenter * maxBarycenter_ / maxRange_) - (module_length - previous_module_length)) +
+                    previous_barycenter;
     }
     assert(_barycenter <= maxBarycenter_ && "Returning barycenter > maxBarycenter");
-    return _barycenter; }
-  cms_uint8_t width() const {return width_; }
+    return _barycenter;
+  }
+  cms_uint8_t width() const { return width_; }
   float avgCharge() const {
-     cms_uint8_t compavgCharge = (compavgCharge_ & 0x3F); 
-     float avgCharge_ = compavgCharge * maxavgCharge_/maxavgChargeRange_ ;
+    cms_uint8_t compavgCharge = (compavgCharge_ & 0x3F);
+    float avgCharge_ = compavgCharge * maxavgCharge_ / maxavgChargeRange_;
     assert(avgCharge_ <= maxavgCharge_ && "Returning avgCharge > maxavgCharge");
-     return avgCharge_; }
-  bool filter() const { return (compavgCharge_& (1<<kfilterMask)); }
-  bool isSaturated() const { return (compavgCharge_& (1<<kSaturatedMask)); }
-  bool peakFilter() const { return (compBarycenter_ & (1<<kpeakFilterMask)); }
+    return avgCharge_;
+  }
+  bool filter() const { return (compavgCharge_ & (1 << kfilterMask)); }
+  bool isSaturated() const { return (compavgCharge_ & (1 << kSaturatedMask)); }
+  bool peakFilter() const { return (compBarycenter_ & (1 << kpeakFilterMask)); }
 
 private:
   cms_uint16_t compBarycenter_ = 0;
   cms_uint8_t width_ = 0;
   cms_uint8_t compavgCharge_ = 0;
-  static constexpr double maxRange_ = 32767; //32767;
+  static constexpr double maxRange_ = 32767;
   static constexpr double maxBarycenter_ = 1536.;
-  static constexpr double maxavgChargeRange_ = 63; //63;
+  static constexpr double maxavgChargeRange_ = 63;
   static constexpr double maxavgCharge_ = 255.;
   static constexpr double trimMaxADC_ = 30.;
   static constexpr double trimMaxFracTotal_ = .15;
diff --git a/DataFormats/SiStripCluster/interface/SiStripCluster.h b/DataFormats/SiStripCluster/interface/SiStripCluster.h
@@ -46,7 +46,11 @@ class SiStripCluster {
   }
 
   SiStripCluster(const SiStripApproximateCluster cluster, const uint16_t maxStrips);
-  SiStripCluster(const SiStripApproximateCluster_v1 cluster, const uint16_t maxStrips, float pc=-999, unsigned int module_length=0, unsigned int previous_module_length=0);
+  SiStripCluster(const SiStripApproximateCluster_v1 cluster,
+                 const uint16_t maxStrips,
+                 float pc = -999,
+                 unsigned int module_length = 0,
+                 unsigned int previous_module_length = 0);
 
   // extend the cluster
   template <typename Iter>
diff --git a/DataFormats/SiStripCluster/src/SiStripApproximateClusterCollection_v1.cc b/DataFormats/SiStripCluster/src/SiStripApproximateClusterCollection_v1.cc
@@ -6,6 +6,6 @@ void SiStripApproximateClusterCollection::reserve(std::size_t dets, std::size_t
 }
 
 SiStripApproximateClusterCollection::Filler SiStripApproximateClusterCollection::beginDet(unsigned int detId) {
-  detIds_.push_back((detIds_.size() == 0) ? detId : detId - (std::accumulate(detIds_.cbegin(), detIds_.cend(),0)));
+  detIds_.push_back((detIds_.empty()) ? detId : detId - (std::accumulate(detIds_.cbegin(), detIds_.cend(), 0)));
   return Filler(clusters_);
 }
diff --git a/DataFormats/SiStripCluster/src/SiStripApproximateCluster_v1.cc b/DataFormats/SiStripCluster/src/SiStripApproximateCluster_v1.cc
@@ -1,28 +1,30 @@
 #include "DataFormats/SiStripCluster/interface/SiStripApproximateCluster_v1.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include <algorithm>
+#include <cassert>
 #include <cmath>
-#include <assert.h>
 
 SiStripApproximateCluster_v1::SiStripApproximateCluster_v1(const SiStripCluster& cluster,
-                                                     unsigned int maxNSat,
-                                                     float hitPredPos,
-                                                     float& previous_cluster,
-                                                     unsigned int& module_length,
-                                                     unsigned int& previous_module_length,
-                                                     bool peakFilter) {
+                                                           unsigned int maxNSat,
+                                                           float hitPredPos,
+                                                           float& previous_cluster,
+                                                           unsigned int& module_length,
+                                                           unsigned int& previous_module_length,
+                                                           bool peakFilter) {
   bool filter_, isSaturated_, peakFilter_;
   if (previous_cluster == -999.)
-   compBarycenter_ = std::round(cluster.barycenter() * maxRange_/maxBarycenter_);
+    compBarycenter_ = std::round(cluster.barycenter() * maxRange_ / maxBarycenter_);
   else
-   compBarycenter_ = std::round(((cluster.barycenter()-previous_cluster)+(module_length-previous_module_length))* maxRange_/maxBarycenter_);
+    compBarycenter_ =
+        std::round(((cluster.barycenter() - previous_cluster) + (module_length - previous_module_length)) * maxRange_ /
+                   maxBarycenter_);
   previous_cluster = barycenter(previous_cluster, module_length, previous_module_length);
   assert(cluster.barycenter() <= maxBarycenter_ && "Got a barycenter > maxBarycenter");
   assert(compBarycenter_ <= maxRange_ && "Filling compBarycenter > maxRange");
-  width_ = std::min(255,(int)cluster.size());//cluster.size();
+  width_ = std::min(255, (int)cluster.size());  //cluster.size();
   float avgCharge_ = cluster.charge() * 1. / width_;
   assert(avgCharge_ <= maxavgCharge_ && "Got a avgCharge > maxavgCharge");
-  compavgCharge_ = std::round(avgCharge_ * maxavgChargeRange_/maxavgCharge_);
+  compavgCharge_ = std::round(avgCharge_ * maxavgChargeRange_ / maxavgCharge_);
   assert(compavgCharge_ <= maxavgChargeRange_ && "Filling compavgCharge > maxavgChargeRange");
   filter_ = false;
   isSaturated_ = false;
diff --git a/DataFormats/SiStripCluster/src/SiStripCluster.cc b/DataFormats/SiStripCluster/src/SiStripCluster.cc
@@ -40,7 +40,12 @@ SiStripCluster::SiStripCluster(const SiStripApproximateCluster cluster, const ui
   firstStrip_ |= approximateMask;
 }
 
-SiStripCluster::SiStripCluster(const SiStripApproximateCluster_v1 cluster, const uint16_t maxStrips, float p_bc,unsigned int module_length, unsigned int previous_module_length) : error_x(-99999.9) {
+SiStripCluster::SiStripCluster(const SiStripApproximateCluster_v1 cluster,
+                               const uint16_t maxStrips,
+                               float p_bc,
+                               unsigned int module_length,
+                               unsigned int previous_module_length)
+    : error_x(-99999.9) {
   barycenter_ = cluster.barycenter(p_bc, module_length, previous_module_length);
   charge_ = cluster.width() * cluster.avgCharge();
   amplitudes_.resize(cluster.width(), cluster.avgCharge());
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripApprox2Clusters.cc b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripApprox2Clusters.cc
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusters2ApproxClusters_v1.cc b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusters2ApproxClusters_v1.cc

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ void SiStripApproximateClusterCollection::reserve(std::size_t dets, std::size_t`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`SiStripApproximateClusterCollection::Filler SiStripApproximateClusterCollection::beginDet(unsigned int detId) {`
`9`		`- detIds_.push_back((detIds_.size() == 0) ? detId : detId - (std::accumulate(detIds_.cbegin(), detIds_.cend(),0)));`
	`9`	`+ detIds_.push_back((detIds_.empty()) ? detId : detId - (std::accumulate(detIds_.cbegin(), detIds_.cend(), 0)));`
`10`	`10`	`return Filler(clusters_);`
`11`	`11`	`}`