bug Fix on the average charge computation.

Configuration/Eras/python/Era_Run2024_pp_on_PbPb_approxSiStripCluster.py

@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
+from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
+from Configuration.ProcessModifiers.trackingNoLoopers_cff import trackingNoLoopers
+
+Run3_pp_on_PbPb_approxSiStripClusters_2024 = cms.ModifierChain(Run3_2024.copyAndExclude([trackingNoLoopers]),  approxSiStripClusters) 

Configuration/Eras/python/Run2024_pp_on_PbPb.py

@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
+from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
+
+Run3_pp_on_PbPb_approxSiStripClusters_2024 = cms.ModifierChain(Run3_2024)#,  approxSiStripClusters, pp_on_AA, pp_on_PbPb_run3) 

DataFormats/SiStripCluster/interface/SiStripApproximateCluster.h

@@ -2,19 +2,20 @@
 #define DataFormats_SiStripCluster_SiStripApproximateCluster_h
 
 #include "FWCore/Utilities/interface/typedefs.h"
+#include "assert.h"
 
 class SiStripCluster;
 class SiStripApproximateCluster {
 public:
   SiStripApproximateCluster() {}
 
-  explicit SiStripApproximateCluster(cms_uint16_t barycenter,
+  explicit SiStripApproximateCluster(cms_uint16_t compBarycenter,
                                      cms_uint8_t width,
                                      cms_uint8_t avgCharge,
                                      bool filter,
                                      bool isSaturated,
                                      bool peakFilter = false)
-      : barycenter_(barycenter),
+      : compBarycenter_(compBarycenter),
         width_(width),
         avgCharge_(avgCharge),
         filter_(filter),
@@ -26,20 +27,25 @@ class SiStripApproximateCluster {
                                      float hitPredPos,
                                      bool peakFilter);
 
-  cms_uint16_t barycenter() const { return barycenter_; }
+  float barycenter() const { 
+    float _barycenter = compBarycenter_ * maxBarycenter_/maxRange_ ;
+    assert(_barycenter <= maxBarycenter_ && "Returning barycenter > maxBarycenter");
+    return _barycenter; }
   cms_uint8_t width() const { return width_; }
   cms_uint8_t avgCharge() const { return avgCharge_; }
   bool filter() const { return filter_; }
   bool isSaturated() const { return isSaturated_; }
   bool peakFilter() const { return peakFilter_; }
 
 private:
-  cms_uint16_t barycenter_ = 0;
+  cms_uint16_t compBarycenter_ = 0;
   cms_uint8_t width_ = 0;
   cms_uint8_t avgCharge_ = 0;
   bool filter_ = false;
   bool isSaturated_ = false;
   bool peakFilter_ = false;
+  static constexpr double maxRange_ = 65535.;  //16 bit
+  static constexpr double maxBarycenter_ = 770.;
   static constexpr double trimMaxADC_ = 30.;
   static constexpr double trimMaxFracTotal_ = .15;
   static constexpr double trimMaxFracNeigh_ = .25;

DataFormats/SiStripCluster/src/SiStripApproximateCluster.cc

@@ -2,14 +2,17 @@
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include <algorithm>
 #include <cmath>
+#include <assert.h>
 
 SiStripApproximateCluster::SiStripApproximateCluster(const SiStripCluster& cluster,
                                                      unsigned int maxNSat,
                                                      float hitPredPos,
                                                      bool peakFilter) {
-  barycenter_ = std::round(cluster.barycenter() * 10);
+  compBarycenter_ = std::round(cluster.barycenter() * maxRange_/maxBarycenter_);
+  assert(cluster.barycenter() <= maxBarycenter_ && "Got a barycenter > maxBarycenter");
+  assert(compBarycenter_ <= maxRange_ && "Filling compBarycenter > maxRange");
   width_ = cluster.size();
-  avgCharge_ = cluster.charge() / cluster.size();
+  avgCharge_ = (cluster.charge() + cluster.size()/2)/ cluster.size();
   filter_ = false;
   isSaturated_ = false;
   peakFilter_ = peakFilter;

DataFormats/SiStripCluster/src/SiStripCluster.cc

@@ -24,7 +24,7 @@ SiStripCluster::SiStripCluster(const SiStripDigiRange& range) : firstStrip_(rang
 }
 
 SiStripCluster::SiStripCluster(const SiStripApproximateCluster cluster, const uint16_t maxStrips) : error_x(-99999.9) {
-  barycenter_ = cluster.barycenter() / 10.0;
+  barycenter_ = cluster.barycenter();
   charge_ = cluster.width() * cluster.avgCharge();
   amplitudes_.resize(cluster.width(), cluster.avgCharge());
   filter_ = cluster.filter();

DataFormats/SiStripCluster/src/classes_def.xml

@@ -32,7 +32,9 @@
  <class name="edm::Wrapper<edmNew::DetSetVector<edm::Ref<edmNew::DetSetVector<SiStripCluster>,SiStripCluster,edmNew::DetSetVector<SiStripCluster>::FindForDetSetVector> > >" />
 
 
- <class name="SiStripApproximateCluster" ClassVersion="6">
+ <class name="SiStripApproximateCluster" ClassVersion="8">
+  <version ClassVersion="8" checksum="3059068941"/>
+  <version ClassVersion="7" checksum="2468177190"/>
   <version ClassVersion="6" checksum="132211472"/>
   <version ClassVersion="5" checksum="3495825183"/>
   <version ClassVersion="4" checksum="2854791577"/>