GPU TPC: Mark clusters of rebuilt track as high incli when interpolated in NoUpdateHighIncl region

Author: davidrohr

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -2268,7 +2268,11 @@ GPUd() void GPUTPCGMMerger::ResolveHitWeights2(int32_t nBlocks, int32_t nThreads
         }
         const auto& best = candidates[candidates[0].best - 1];
         const ClusterNative& GPUrestrict() cl = GetConstantMem()->ioPtrs.clustersNative->clustersLinear[best.id - 2];
-        outCl = {.num = best.id - 2, .sector = best.sector, .row = (uint8_t)j, .state = (uint8_t)(cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags)};
+        uint8_t flags = (uint8_t)(cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags);
+        if ((mTrackRebuildHelper[i].highInclRowLow != 255 && j <= mTrackRebuildHelper[i].highInclRowLow) || (mTrackRebuildHelper[i].highInclRowHigh != 255 && j >= mTrackRebuildHelper[i].highInclRowHigh)) {
+          flags |= GPUTPCGMMergedTrackHit::flagHighIncl;
+        }
+        outCl = {.num = best.id - 2, .sector = best.sector, .row = (uint8_t)j, .state = flags};
         written++;
         CADEBUG(printf("REBUILD: iTrk %d Assigned Cluster Row %d Hit %d\n", i, j, best.id - 2));
       }

GPU/GPUTracking/Merger/GPUTPCGMMerger.h

@@ -87,7 +87,9 @@ class GPUTPCGMMerger : public GPUProcessor
   };
 
   struct trackRebuildHelper {
-    bool reverse;
+    uint8_t reverse;
+    uint8_t highInclRowLow;
+    uint8_t highInclRowHigh;
   };
 
   struct tmpSort {
@@ -123,6 +125,7 @@ class GPUTPCGMMerger : public GPUProcessor
   GPUhdi() const GPUTPCGMMergedTrackHit* Clusters() const { return mClusters; }
   GPUhdi() GPUTPCGMMergedTrackHit* Clusters() { return mClusters; }
   GPUhdi() trackCluster* ClusterCandidates() { return mClusterCandidates; }
+  GPUhdi() trackRebuildHelper* TrackRebuildHelper() { return mTrackRebuildHelper; }
   GPUhdi() int32_t* HitWeights() { return mHitWeights; }
   GPUhdi() GPUAtomic(uint32_t) * ClusterAttachment() const { return mClusterAttachment; }
   GPUhdi() uint32_t* TrackOrderAttach() const { return mTrackOrderAttach; }

GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx

@@ -70,6 +70,10 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
     for (uint32_t i = 0; i < interpolation.size; i++) { // TODO: Tune the zeroing size
       interpolation.hit[i].errorY = -1;
     }
+    if (param.rec.tpc.rebuildTrackInFit) {
+      merger.TrackRebuildHelper()[iTrk].highInclRowLow = 255;
+      merger.TrackRebuildHelper()[iTrk].highInclRowHigh = 255;
+    }
   }
 
   const int32_t nWays = param.rec.tpc.nWays;
@@ -212,6 +216,28 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
         continue;
       }
 
+      const float maxSinForUpdate = CAMath::Sin(70.f * CAMath::Deg2Rad());
+      if (mNDF > 0 && CAMath::Abs(prop.GetSinPhi0()) >= maxSinForUpdate) {
+        MarkClusters(clusters, ihitMergeFirst, ihit, wayDirection, GPUTPCGMMergedTrackHit::flagHighIncl);
+        nMissed2++;
+        CADEBUG(printf(" --- break-sinphi\n"));
+        NTolerated++;
+        const bool inward = clusters[0].row > clusters[maxN - 1].row;
+        const bool markHighIncl = (mP[2] > 0) ^ (mP[4] < 0) ^ inward ^ (iWay & 1);
+        if (param.rec.tpc.rebuildTrackInFit && markHighIncl) {
+          if (inward ^ (iWay & 1)) {
+            if (merger.TrackRebuildHelper()[iTrk].highInclRowLow == 255) {
+              merger.TrackRebuildHelper()[iTrk].highInclRowLow = cluster.row;
+            }
+          } else {
+            if (merger.TrackRebuildHelper()[iTrk].highInclRowHigh == 255) {
+              merger.TrackRebuildHelper()[iTrk].highInclRowHigh = cluster.row;
+            }
+          }
+        }
+        continue;
+      }
+
       int32_t retValHit = FitHit(merger, iTrk, track, xx, yy, zz, clusterState, clAlpha, iWay, inFlyDirection, deltaZ, lastUpdateX, clusters, prop, inter, dEdx, dEdxAlt, sumInvSqrtCharge, nAvgCharge, ihit, ihitMergeFirst, allowChangeClusters, refit, finalFit, nMissed, nMissed2, resetT0, uncorrectedY);
       if (retValHit == 0) {
         DodEdx(dEdx, dEdxAlt, merger, finalFit, ihit, ihitMergeFirst, wayDirection, clusters, clusterState, zz, dEdxSubThresholdRow);
@@ -221,9 +247,6 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
         covYYUpd = mC[0];
       } else if (retValHit == 1) {
         break;
-      } else if (retValHit == 2) {
-        NTolerated++;
-        continue;
       }
 
       lastUpdateRow = cluster.row;
@@ -317,14 +340,6 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
   const int32_t wayDirection = (iWay & 1) ? -1 : 1;
   const auto& cluster = clusters[ihit];
 
-  const float maxSinForUpdate = CAMath::Sin(70.f * CAMath::Deg2Rad());
-  if (mNDF > 0 && CAMath::Abs(prop.GetSinPhi0()) >= maxSinForUpdate) {
-    MarkClusters(clusters, ihitMergeFirst, ihit, wayDirection, GPUTPCGMMergedTrackHit::flagHighIncl);
-    nMissed2++;
-    CADEBUG(printf(" --- break-sinphi\n"));
-    return 2; // Propagate failed or high incl angle
-  }
-
   int32_t retValUpd = 0, retValInt = 0;
   float threshold = 3.f + (lastUpdateX >= 0 ? (CAMath::Abs(mX - lastUpdateX) / 2) : 0.f);
   if (mNDF > (int32_t)param.rec.tpc.mergerNonInterpolateRejectMinNDF && (CAMath::Abs(yy - mP[0]) > threshold || CAMath::Abs(zz - mP[1]) > threshold)) {