GPUTracking: replace the merger's goto with a flag

MSL supports neither goto nor labels. The label sat at the end of the loop body,
so each jump was a continue for the outer loop that could not be written as one
because it was issued from an inner loop. The flag is set there instead, breaks
out of the loop it was raised in, and continues the outer one; where the jump
came from two levels down it breaks twice.

The k loop is left early exactly as before, and nothing between the old jumps
and the old label ran then either.

Author: ktf

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -554,7 +554,7 @@ GPUd() int32_t GPUTPCGMMerger::RefitSectorTrack(GPUTPCGMSectorTrack& sectorTrack
   GPUTPCGMPropagator prop;
   prop.SetMaterialTPC();
   prop.SetMaxSinPhi(constants::MAX_SIN_PHI);
-  prop.SetSeedingErrors(true); // Larger errors for seeds, better since we don't start with good hypothesis
+  prop.SetSeedingErrors(true);    // Larger errors for seeds, better since we don't start with good hypothesis
   prop.SetFitInProjections(true); // TODO: Was false, consider reenabling after fitInProjection is fixed
   prop.SetPolynomialField(&Param().polynomialField);
   GPUTPCGMTrackParam trk;
@@ -1202,6 +1202,7 @@ GPUd() void GPUTPCGMMerger::ResolveMergeSectors(GPUResolveSharedMemory& smem, in
       // PrintMergeGraph(track1, std::cout);
       // PrintMergeGraph(track2, std::cout);
 
+      bool nextTrack = false;
       while (track2->PrevSegmentNeighbour() >= 0) {
         track2 = &mSectorTrackInfos[track2->PrevSegmentNeighbour()];
       }
@@ -1212,26 +1213,41 @@ GPUd() void GPUTPCGMMerger::ResolveMergeSectors(GPUResolveSharedMemory& smem, in
         while (track1->PrevSegmentNeighbour() >= 0) {
           track1 = &mSectorTrackInfos[track1->PrevSegmentNeighbour()];
           if (track1 == track2) {
-            goto NextTrack;
+            nextTrack = true;
+            break;
           }
         }
+        if (nextTrack) {
+          continue;
+        }
         GPUCommonAlgorithm::swap(track1, track1Base);
         for (int32_t k = 0; k < 2; k++) {
           GPUTPCGMSectorTrack* tmp = track1Base;
           while (tmp->Neighbour(k) >= 0) {
             tmp = &mSectorTrackInfos[tmp->Neighbour(k)];
             if (tmp == track2) {
-              goto NextTrack;
+              nextTrack = true;
+              break;
             }
           }
+          if (nextTrack) {
+            break;
+          }
+        }
+        if (nextTrack) {
+          continue;
         }
 
         while (track1->NextSegmentNeighbour() >= 0) {
           track1 = &mSectorTrackInfos[track1->NextSegmentNeighbour()];
           if (track1 == track2) {
-            goto NextTrack;
+            nextTrack = true;
+            break;
           }
         }
+        if (nextTrack) {
+          continue;
+        }
       } else {
         while (track1->PrevSegmentNeighbour() >= 0) {
           track1 = &mSectorTrackInfos[track1->PrevSegmentNeighbour()];
@@ -1245,9 +1261,16 @@ GPUd() void GPUTPCGMMerger::ResolveMergeSectors(GPUResolveSharedMemory& smem, in
           while (tmp->Neighbour(k) >= 0) {
             tmp = &mSectorTrackInfos[tmp->Neighbour(k)];
             if (tmp == track2) {
-              goto NextTrack;
+              nextTrack = true;
+              break;
             }
           }
+          if (nextTrack) {
+            break;
+          }
+        }
+        if (nextTrack) {
+          continue;
         }
 
         float z1min, z1max, z2min, z2max;
@@ -1319,7 +1342,6 @@ GPUd() void GPUTPCGMMerger::ResolveMergeSectors(GPUResolveSharedMemory& smem, in
       }
       // GPUInfo("Result");
       // PrintMergeGraph(track1, std::cout);
-    NextTrack:;
     }
   }
 }
@@ -1851,7 +1873,7 @@ GPUd() void GPUTPCGMMerger::PrepareForFit1(int32_t nBlocks, int32_t nThreads, in
       if (!trk.CCE() && !trk.MergedLooper()) {
         GPUTPCGMMergedTrack* updTrk = trk.GetFirstSegment(mMergedTracks, Param().rec.enableCyclicGraphWorkarounds);
         const auto &cl0 = mClusters[trk.FirstClusterRef()], &cln = mClusters[updTrk->FirstClusterRef() + updTrk->NClusters() - 1];
-        const auto& GPUrestrict() cls = GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
+        const auto& GPUrestrict() cls = GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
         float z0 = cls[cl0.num].getTime(), zn = cls[cln.num].getTime();
         const auto tmp = zn > z0 ? std::array<float, 3>{zn, z0, GPUTPCGeometry::Row2X(cln.row)} : std::array<float, 3>{z0, zn, GPUTPCGeometry::Row2X(cl0.row)};
         trk.Param().ShiftZ(this, cl0.sector, tmp[0], tmp[1], tmp[2]);