Adjust handling of saturated qTot

fweig · fweig · commit 1dd58238c31c · 2026-06-03T17:47:24.000+02:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNative.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNative.h
@@ -90,7 +90,8 @@ struct ClusterNative {
   GPUd() uint16_t getQtot() const
   {
     if (isSaturated()) [[unlikely]] {
-      return maxRegularQtot;
+      auto sQtot = getSaturatedQtot();
+      return sQtot < USHRT_MAX ? sQtot : USHRT_MAX;
     }
     return qTot;
   }
@@ -158,10 +159,10 @@ struct ClusterNative {
 
   GPUd() void setSaturatedQtot(uint32_t qtot)
   {
-    if (qtot > maxSaturatedQtot) {
-      qtot = maxSaturatedQtot;
+    this->qTot = USHRT_MAX;
+    if (qtot < maxSaturatedQtot) {
+      this->qTot = ((qtot + scaleSaturatedQtot / 2) / scaleSaturatedQtot) + maxRegularQtot;
     }
-    this->qTot = ((qtot + scaleSaturatedQtot / 2) / scaleSaturatedQtot) + maxRegularQtot;
   }
 
   GPUd() uint32_t getSaturatedQtot() const

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ struct ClusterNative {`
`90`	`90`	`GPUd() uint16_t getQtot() const`
`91`	`91`	`{`
`92`	`92`	`if (isSaturated()) [[unlikely]] {`
`93`		`- return maxRegularQtot;`
	`93`	`+ auto sQtot = getSaturatedQtot();`
	`94`	`+ return sQtot < USHRT_MAX ? sQtot : USHRT_MAX;`
`94`	`95`	`}`
`95`	`96`	`return qTot;`
`96`	`97`	`}`
`@@ -158,10 +159,10 @@ struct ClusterNative {`
`158`	`159`
`159`	`160`	`GPUd() void setSaturatedQtot(uint32_t qtot)`
`160`	`161`	`{`
`161`		`- if (qtot > maxSaturatedQtot) {`
`162`		`- qtot = maxSaturatedQtot;`
	`162`	`+ this->qTot = USHRT_MAX;`
	`163`	`+ if (qtot < maxSaturatedQtot) {`
	`164`	`+ this->qTot = ((qtot + scaleSaturatedQtot / 2) / scaleSaturatedQtot) + maxRegularQtot;`
`163`	`165`	`}`
`164`		`- this->qTot = ((qtot + scaleSaturatedQtot / 2) / scaleSaturatedQtot) + maxRegularQtot;`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`GPUd() uint32_t getSaturatedQtot() const`