TPC Clusterizer: Add relative noise suppression epsilon

davidrohr · davidrohr · commit ec4bdb127258 · 2022-10-29T09:07:38.000+02:00
diff --git a/GPU/GPUTracking/Definitions/GPUSettingsList.h b/GPU/GPUTracking/Definitions/GPUSettingsList.h
@@ -56,6 +56,7 @@ AddOptionRTC(cfQTotCutoff, unsigned char, 5, "", 0, "Cluster Finder rejects clus
 AddOptionRTC(cfInnerThreshold, unsigned char, 0, "", 0, "Cluster Finder extends cluster if inner charge above this threshold")
 AddOptionRTC(cfMinSplitNum, unsigned char, 1, "", 0, "Minimum number of split charges in a cluster for the cluster to be marked as split")
 AddOptionRTC(cfNoiseSuppressionEpsilon, unsigned char, 10, "", 0, "Cluster Finder: Difference between peak and charge for the charge to count as a minima during noise suppression")
+AddOptionRTC(cfNoiseSuppressionEpsilonRelative, unsigned char, 76, "", 0, "Cluster Finder: Difference between peak and charge for the charge to count as a minima during noise suppression, relative as fraction of 255")
 AddOptionRTC(nWays, char, 3, "", 0, "Do N fit passes in final fit of merger")
 AddOptionRTC(nWaysOuter, char, 0, "", 0, "Store outer param")
 AddOptionRTC(trackFitRejectMode, char, 5, "", 0, "0: no limit on rejection or missed hits, >0: break after n rejected hits, <0: reject at max -n hits")
diff --git a/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFNoiseSuppression.cxx b/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFNoiseSuppression.cxx
@@ -95,16 +95,17 @@ GPUd() void GPUTPCCFNoiseSuppression::updatePeaksImpl(int nBlocks, int nThreads,
 }
 
 GPUdi() void GPUTPCCFNoiseSuppression::checkForMinima(
-  float q,
-  float epsilon,
+  const float q,
+  const float epsilon,
+  const float epsilonRelative,
   PackedCharge other,
   int pos,
   ulong* minimas,
   ulong* bigger)
 {
   float r = other.unpack();
 
-  ulong isMinima = (q - r > epsilon);
+  ulong isMinima = (q - r > epsilon) && (float)CAMath::Abs(q - r) / (float)CAMath::Max(q, r) > epsilonRelative; // TODO: Can we assume q > r and get rid of Max/Abs?
   *minimas |= (isMinima << pos);
 
   ulong lq = (r > q);
@@ -118,14 +119,15 @@ GPUdi() void GPUTPCCFNoiseSuppression::findMinima(
   int pos,
   const float q,
   const float epsilon,
+  const float epsilonRelative,
   ulong* minimas,
   ulong* bigger)
 {
   GPUCA_UNROLL(U(), U())
   for (int i = 0; i < N; i++, pos++) {
     PackedCharge other = buf[N * ll + i];
 
-    checkForMinima(q, epsilon, other, pos, minimas, bigger);
+    checkForMinima(q, epsilon, epsilonRelative, other, pos, minimas, bigger);
   }
 }
 
@@ -209,6 +211,7 @@ GPUd() void GPUTPCCFNoiseSuppression::findMinimaAndPeaks(
     16,
     q,
     calibration.tpc.cfNoiseSuppressionEpsilon,
+    calibration.tpc.cfNoiseSuppressionEpsilonRelative / 255.,
     minimas,
     bigger);
 
@@ -231,6 +234,7 @@ GPUd() void GPUTPCCFNoiseSuppression::findMinimaAndPeaks(
       0,
       q,
       calibration.tpc.cfNoiseSuppressionEpsilon,
+      calibration.tpc.cfNoiseSuppressionEpsilonRelative / 255.,
       minimas,
       bigger);
   }
@@ -254,6 +258,7 @@ GPUd() void GPUTPCCFNoiseSuppression::findMinimaAndPeaks(
       18,
       q,
       calibration.tpc.cfNoiseSuppressionEpsilon,
+      calibration.tpc.cfNoiseSuppressionEpsilonRelative / 255.,
       minimas,
       bigger);
   }
@@ -278,6 +283,7 @@ GPUd() void GPUTPCCFNoiseSuppression::findMinimaAndPeaks(
       0,
       q,
       calibration.tpc.cfNoiseSuppressionEpsilon,
+      calibration.tpc.cfNoiseSuppressionEpsilonRelative / 255.,
       minimas,
       bigger);
   }
@@ -301,6 +307,7 @@ GPUd() void GPUTPCCFNoiseSuppression::findMinimaAndPeaks(
       18,
       q,
       calibration.tpc.cfNoiseSuppressionEpsilon,
+      calibration.tpc.cfNoiseSuppressionEpsilonRelative / 255.,
       minimas,
       bigger);
   }
diff --git a/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFNoiseSuppression.h b/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFNoiseSuppression.h
@@ -61,9 +61,9 @@ class GPUTPCCFNoiseSuppression : public GPUKernelTemplate
 
   static GPUd() void updatePeaksImpl(int, int, int, int, const ChargePos*, const uchar*, const uint, Array2D<uchar>&);
 
-  static GPUdi() void checkForMinima(float, float, PackedCharge, int, ulong*, ulong*);
+  static GPUdi() void checkForMinima(const float, const float, const float, PackedCharge, int, ulong*, ulong*);
 
-  static GPUdi() void findMinima(const PackedCharge*, const ushort, const int, int, const float, const float, ulong*, ulong*);
+  static GPUdi() void findMinima(const PackedCharge*, const ushort, const int, int, const float, const float, const float, ulong*, ulong*);
 
   static GPUdi() void findPeaks(const uchar*, const ushort, const int, int, ulong*);
 
