GPU: Add option for zero-suppression threshold for input digits

davidrohr · davidrohr · commit 1641d3ff5a14 · 2019-10-24T13:27:54.000+02:00
diff --git a/Detectors/TPC/reconstruction/src/GPUCATracking.cxx b/Detectors/TPC/reconstruction/src/GPUCATracking.cxx
@@ -86,12 +86,15 @@ int GPUCATracking::runTracking(GPUO2InterfaceIOPtrs* data)
   GPUTrackingInOutPointers ptrs;
   if (data->o2Digits) {
     ptrs.clustersNative = nullptr;
+    const float zsThreshold = mTrackingCAO2Interface->getConfig().configReconstruction.tpcZSthreshold;
     for (int i = 0; i < Sector::MAXSECTOR; i++) {
       const std::vector<o2::tpc::Digit>& d = (*(data->o2Digits))[i];
       gpuDigits[i].reserve(d.size());
       gpuDigitsMap.tpcDigits[i] = gpuDigits[i].data();
       for (int j = 0; j < d.size(); j++) {
-        gpuDigits[i].emplace_back(gpucf::PackedDigit{d[j].getChargeFloat(), (gpucf::timestamp)d[j].getTimeStamp(), (gpucf::pad_t)d[j].getPad(), (gpucf::row_t)d[j].getRow()});
+        if (d[j].getChargeFloat() >= zsThreshold) {
+          gpuDigits[i].emplace_back(gpucf::PackedDigit{d[j].getChargeFloat(), (gpucf::timestamp)d[j].getTimeStamp(), (gpucf::pad_t)d[j].getPad(), (gpucf::row_t)d[j].getRow()});
+        }
       }
       gpuDigitsMap.nTPCDigits[i] = gpuDigits[i].size();
     }
diff --git a/GPU/GPUTracking/Base/GPUSettings.cxx b/GPU/GPUTracking/Base/GPUSettings.cxx
@@ -43,6 +43,7 @@ void GPUSettingsRec::SetDefaults()
   tpcCompressionSortOrder = GPUSettings::SortPad;
   tpcSigBitsCharge = 4;
   tpcSigBitsWidth = 3;
+  tpcZSthreshold = 2;
 }
 
 void GPUSettingsEvent::SetDefaults()
diff --git a/GPU/GPUTracking/Base/GPUSettings.h b/GPU/GPUTracking/Base/GPUSettings.h
@@ -73,6 +73,7 @@ struct GPUSettingsRec {
   unsigned char tpcCompressionSortOrder; // Sort order for clusters storred as differences (0 = time, 1 = pad, 2 = Z-curve-time-pad, 3 = Z-curve-pad-time)
   unsigned char tpcSigBitsCharge;        // Number of significant bits for TPC cluster charge in compression mode 1
   unsigned char tpcSigBitsWidth;         // Number of significant bits for TPC cluster width in compression mode 1
+  unsigned char tpcZSthreshold;          // TPC Zero Suppression Threshold (for loading digits / forwarging digits as clusters)
 };
 
 // Settings describing the events / time frames
diff --git a/GPU/GPUTracking/Interface/GPUO2Interface.h b/GPU/GPUTracking/Interface/GPUO2Interface.h
@@ -56,6 +56,8 @@ class GPUTPCO2Interface
   bool GetParamContinuous() { return (mContinuous); }
   void GetClusterErrors2(int row, float z, float sinPhi, float DzDs, float& ErrY2, float& ErrZ2) const;
 
+  const GPUO2InterfaceConfiguration& getConfig() const { return *mConfig; }
+
  private:
   GPUTPCO2Interface(const GPUTPCO2Interface&);
   GPUTPCO2Interface& operator=(const GPUTPCO2Interface&);

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ void GPUSettingsRec::SetDefaults()`
`43`	`43`	`tpcCompressionSortOrder = GPUSettings::SortPad;`
`44`	`44`	`tpcSigBitsCharge = 4;`
`45`	`45`	`tpcSigBitsWidth = 3;`
	`46`	`+ tpcZSthreshold = 2;`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`void GPUSettingsEvent::SetDefaults()`