GPU TPC: attachProtect cluster flag should not affect other flags

Author: davidrohr

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -1900,9 +1900,7 @@ GPUd() void GPUTPCGMMerger::Finalize0(int32_t nBlocks, int32_t nThreads, int32_t
     mTrackSort[mTrackOrderAttach[i]] = i;
   }
   for (uint32_t i = iBlock * nThreads + iThread; i < mMemory->nMergedTrackClusters; i += nThreads * nBlocks) {
-    if (!(mClusterAttachment[mClusters[i].num] & attachProtect)) {
-      mClusterAttachment[mClusters[i].num] = 0; // Reset adjacent attachment for attached clusters, set correctly below
-    }
+    mClusterAttachment[mClusters[i].num] = mClusterAttachment[mClusters[i].num] & attachProtect; // Reset adjacent attachment for attached clusters, set correctly below
   }
 }
 
@@ -1925,7 +1923,7 @@ GPUd() void GPUTPCGMMerger::Finalize1(int32_t nBlocks, int32_t nThreads, int32_t
       if (trk.Leg() == 0) {
         weight |= attachGoodLeg;
       }
-      if (CAMath::Abs(trk.GetParam().GetQPt() * Param().qptB5Scaler) <= Param().rec.tpc.rejectQPtB5 && !trk.MergedLooper() && trk.Leg() == 0) {
+      if ((mClusterAttachment[id] & attachProtect) || CAMath::Abs(trk.GetParam().GetQPt() * Param().qptB5Scaler) <= Param().rec.tpc.rejectQPtB5 && !trk.MergedLooper() && trk.Leg() == 0) {
         weight |= attachProtect;
       }
       CAMath::AtomicMax(&mClusterAttachment[id], weight);