GPU: Rename confusing globalTracking option to extrapolationTracking

Author: davidrohr

GPU/GPUTracking/CMakeLists.txt

@@ -45,7 +45,7 @@ set(SRCS
     SliceTracker/GPUTPCGrid.cxx
     SliceTracker/GPUTPCTrackletSelector.cxx
     SliceTracker/GPUTPCRow.cxx
-    SliceTracker/GPUTPCGlobalTracking.cxx
+    SliceTracker/GPUTPCExtrapolationTracking.cxx
     SliceTracker/GPUTPCCreateSliceData.cxx
     Merger/GPUTPCGMMerger.cxx
     Merger/GPUTPCGMSliceTrack.cxx

GPU/GPUTracking/Definitions/GPUDefGPUParameters.h

@@ -39,7 +39,7 @@
   #define GPUCA_LB_GPUTPCTrackletSelector 192, 3
   #define GPUCA_LB_GPUTPCNeighboursFinder 1024, 1
   #define GPUCA_LB_GPUTPCNeighboursCleaner 896
-  #define GPUCA_LB_GPUTPCGlobalTracking 256
+  #define GPUCA_LB_GPUTPCExtrapolationTracking 256
   #define GPUCA_LB_GPUTPCCFDecodeZS 64, 4
   #define GPUCA_LB_GPUTPCCFDecodeZSLink GPUCA_WARP_SIZE
   #define GPUCA_LB_GPUTPCCFDecodeZSDenseLink GPUCA_WARP_SIZE
@@ -60,7 +60,7 @@
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step0 512
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step2 512
   #define GPUCA_LB_GPUTPCGMMergerMergeCE 512
-  #define GPUCA_LB_GPUTPCGMMergerLinkGlobalTracks 256
+  #define GPUCA_LB_GPUTPCGMMergerLinkExtrapolatedTracks 256
   #define GPUCA_LB_GPUTPCGMMergerCollect 512
   #define GPUCA_LB_GPUTPCGMMergerSortTracksPrepare 256
   #define GPUCA_LB_GPUTPCGMMergerPrepareClusters_step0 256
@@ -105,7 +105,7 @@
   #define GPUCA_LB_GPUTPCTrackletSelector 256, 8
   #define GPUCA_LB_GPUTPCNeighboursFinder 1024, 1
   #define GPUCA_LB_GPUTPCNeighboursCleaner 896
-  #define GPUCA_LB_GPUTPCGlobalTracking 256
+  #define GPUCA_LB_GPUTPCExtrapolationTracking 256
   #define GPUCA_LB_GPUTPCCFDecodeZS 64, 4
   #define GPUCA_LB_GPUTPCCFDecodeZSLink GPUCA_WARP_SIZE
   #define GPUCA_LB_GPUTPCCFDecodeZSDenseLink GPUCA_WARP_SIZE
@@ -126,7 +126,7 @@
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step0 256
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step2 256
   #define GPUCA_LB_GPUTPCGMMergerMergeCE 256
-  #define GPUCA_LB_GPUTPCGMMergerLinkGlobalTracks 256
+  #define GPUCA_LB_GPUTPCGMMergerLinkExtrapolatedTracks 256
   #define GPUCA_LB_GPUTPCGMMergerCollect 512
   #define GPUCA_LB_GPUTPCGMMergerSortTracksPrepare 256
   #define GPUCA_LB_GPUTPCGMMergerPrepareClusters_step0 256
@@ -171,7 +171,7 @@
   #define GPUCA_LB_GPUTPCTrackletSelector 192, 3    // best single-kernel: 128, 4
   #define GPUCA_LB_GPUTPCNeighboursFinder 640, 1    // best single-kernel: 768, 1
   #define GPUCA_LB_GPUTPCNeighboursCleaner 512
-  #define GPUCA_LB_GPUTPCGlobalTracking 128, 4
+  #define GPUCA_LB_GPUTPCExtrapolationTracking 128, 4
   #define GPUCA_LB_GPUTPCCFDecodeZS 64, 10
   #define GPUCA_LB_GPUTPCCFDecodeZSLink GPUCA_WARP_SIZE
   #define GPUCA_LB_GPUTPCCFDecodeZSDenseLink GPUCA_WARP_SIZE
@@ -192,7 +192,7 @@
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step0 192
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step2 64, 2
   #define GPUCA_LB_GPUTPCGMMergerMergeCE 256
-  #define GPUCA_LB_GPUTPCGMMergerLinkGlobalTracks 256
+  #define GPUCA_LB_GPUTPCGMMergerLinkExtrapolatedTracks 256
   #define GPUCA_LB_GPUTPCGMMergerCollect 256, 2
   #define GPUCA_LB_GPUTPCGMMergerSortTracksPrepare 256
   #define GPUCA_LB_GPUTPCGMMergerPrepareClusters_step0 256
@@ -237,7 +237,7 @@
   #define GPUCA_LB_GPUTPCTrackletSelector 192, 3
   #define GPUCA_LB_GPUTPCNeighboursFinder 640, 1
   #define GPUCA_LB_GPUTPCNeighboursCleaner 512
-  #define GPUCA_LB_GPUTPCGlobalTracking 192, 2
+  #define GPUCA_LB_GPUTPCExtrapolationTracking 192, 2
   #define GPUCA_LB_GPUTPCCFDecodeZS 64, 8
   #define GPUCA_LB_GPUTPCCFDecodeZSLink GPUCA_WARP_SIZE
   #define GPUCA_LB_GPUTPCCFDecodeZSDenseLink GPUCA_WARP_SIZE
@@ -258,7 +258,7 @@
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step0 192
   #define GPUCA_LB_GPUTPCGMMergerMergeBorders_step2 256
   #define GPUCA_LB_GPUTPCGMMergerMergeCE 256
-  #define GPUCA_LB_GPUTPCGMMergerLinkGlobalTracks 256
+  #define GPUCA_LB_GPUTPCGMMergerLinkExtrapolatedTracks 256
   #define GPUCA_LB_GPUTPCGMMergerCollect 128, 2
   #define GPUCA_LB_GPUTPCGMMergerSortTracksPrepare 256
   #define GPUCA_LB_GPUTPCGMMergerPrepareClusters_step0 256
@@ -312,8 +312,8 @@
   #ifndef GPUCA_LB_GPUTPCNeighboursCleaner
     #define GPUCA_LB_GPUTPCNeighboursCleaner 256
   #endif
-  #ifndef GPUCA_LB_GPUTPCGlobalTracking
-    #define GPUCA_LB_GPUTPCGlobalTracking 256
+  #ifndef GPUCA_LB_GPUTPCExtrapolationTracking
+    #define GPUCA_LB_GPUTPCExtrapolationTracking 256
   #endif
   #ifndef GPUCA_LB_GPUTRDTrackerKernels_gpuVersion
     #define GPUCA_LB_GPUTRDTrackerKernels_gpuVersion 512
@@ -414,8 +414,8 @@
   #ifndef GPUCA_LB_GPUTPCGMMergerMergeCE
     #define GPUCA_LB_GPUTPCGMMergerMergeCE 256
   #endif
-  #ifndef GPUCA_LB_GPUTPCGMMergerLinkGlobalTracks
-    #define GPUCA_LB_GPUTPCGMMergerLinkGlobalTracks 256
+  #ifndef GPUCA_LB_GPUTPCGMMergerLinkExtrapolatedTracks
+    #define GPUCA_LB_GPUTPCGMMergerLinkExtrapolatedTracks 256
   #endif
   #ifndef GPUCA_LB_GPUTPCGMMergerCollect
     #define GPUCA_LB_GPUTPCGMMergerCollect 256

GPU/GPUTracking/Definitions/GPUSettingsList.h

@@ -90,8 +90,8 @@ AddOptionRTC(extraClusterErrorFactorSplitPadSharedSingleY2, float, 3.0f, "", 0,
 AddOptionRTC(extraClusterErrorSplitTimeSharedSingleZ2, float, 0.03f, "", 0, "Additive extra cluster error for Z2 if splittime, shared, or single set")
 AddOptionRTC(extraClusterErrorFactorSplitTimeSharedSingleZ2, float, 3.0f, "", 0, "Multiplicative extra cluster error for Z2 if splittime, shared, or single set")
 AddOptionArray(errorsCECrossing, float, 5, (0.f, 0.f, 0.f, 0.f, 0.f), "", 0, "Extra errors to add to track when crossing CE, depending on addErrorsCECrossing") // BUG: CUDA cannot yet handle AddOptionArrayRTC
-AddOptionRTC(globalTrackingYRangeUpper, float, 0.85f, "", 0, "Inner portion of y-range in slice that is not used in searching for global track candidates")
-AddOptionRTC(globalTrackingYRangeLower, float, 0.85f, "", 0, "Inner portion of y-range in slice that is not used in searching for global track candidates")
+AddOptionRTC(extrapolationTrackingYRangeUpper, float, 0.85f, "", 0, "Inner portion of y-range in slice that is not used in searching for extrapolated track candidates")
+AddOptionRTC(extrapolationTrackingYRangeLower, float, 0.85f, "", 0, "Inner portion of y-range in slice that is not used in searching for extrapolated track candidates")
 AddOptionRTC(trackFollowingYFactor, float, 4.f, "", 0, "Weight of y residual vs z residual in tracklet constructor")
 AddOptionRTC(trackMergerFactor2YS, float, 1.5f * 1.5f, "", 0, "factor2YS for track merging")
 AddOptionRTC(trackMergerFactor2ZT, float, 1.5f * 1.5f, "", 0, "factor2ZT for track merging")
@@ -116,9 +116,9 @@ AddOptionRTC(mergerLooperSecondHorizontalQPtB5Limit, uint8_t, 2, "", 0, "Min Q/P
 AddOptionRTC(trackFollowingMaxRowGap, uint8_t, 4, "", 0, "Maximum number of consecutive rows without hit in track following")
 AddOptionRTC(trackFollowingMaxRowGapSeed, uint8_t, 2, "", 0, "Maximum number of consecutive rows without hit in track following during fit of seed")
 AddOptionRTC(trackFitMaxRowMissedHard, uint8_t, 10, "", 0, "Hard limit for number of missed rows in fit / propagation")
-AddOptionRTC(globalTrackingRowRange, uint8_t, 45, "", 0, "Number of rows from the upped/lower limit to search for global track candidates in for")
-AddOptionRTC(globalTrackingMinRows, uint8_t, 10, "", 0, "Min num of rows an additional global track must span over")
-AddOptionRTC(globalTrackingMinHits, uint8_t, 8, "", 0, "Min num of hits for an additional global track")
+AddOptionRTC(extrapolationTrackingRowRange, uint8_t, 45, "", 0, "Number of rows from the upped/lower limit to search for extrapolated track candidates in for")
+AddOptionRTC(extrapolationTrackingMinRows, uint8_t, 10, "", 0, "Min num of rows an additional extrapolated track must span over")
+AddOptionRTC(extrapolationTrackingMinHits, uint8_t, 8, "", 0, "Min num of hits for an additional extrapolated track")
 AddOptionRTC(noisyPadsQuickCheck, uint8_t, 1, "", 0, "Only check first fragment for noisy pads instead of all fragments (when test is enabled).")
 AddOptionRTC(cfQMaxCutoff, uint8_t, 3, "", 0, "Cluster Finder rejects cluster with qmax below or equal to this threshold")
 AddOptionRTC(cfQTotCutoff, uint8_t, 5, "", 0, "Cluster Finder rejects cluster with qtot below or equal to this threshold")
@@ -134,7 +134,7 @@ AddOptionRTC(trackFitRejectMode, int8_t, 5, "", 0, "0: no limit on rejection or
 AddOptionRTC(rejectIFCLowRadiusCluster, uint8_t, 0, "", 0, "Reject clusters that get the IFC mask error during refit")
 AddOptionRTC(dEdxTruncLow, uint8_t, 2, "", 0, "Low truncation threshold, fraction of 128")
 AddOptionRTC(dEdxTruncHigh, uint8_t, 77, "", 0, "High truncation threshold, fraction of 128")
-AddOptionRTC(globalTracking, int8_t, 1, "", 0, "Enable Global Tracking (prolong tracks to adjacent sectors to find short segments)")
+AddOptionRTC(extrapolationTracking, int8_t, 1, "", 0, "Enable Extrapolation Tracking (prolong tracks to adjacent sectors to find short segments)")
 AddOptionRTC(disableRefitAttachment, uint8_t, 0, "", 0, "Bitmask to disable certain attachment steps during refit (1: attachment, 2: propagation, 4: loop following, 8: mirroring)")
 AddOptionRTC(rejectionStrategy, uint8_t, o2::gpu::GPUSettings::RejectionStrategyA, "", 0, "Enable rejection of TPC clusters for compression (0 = no, 1 = strategy A, 2 = strategy B)")
 AddOptionRTC(mergeLoopersAfterburner, uint8_t, 1, "", 0, "Run afterburner for additional looper merging")
@@ -315,7 +315,7 @@ AddOption(drawInitLinks, bool, false, "", 0, "Highlight cleaned-up links")
 AddOption(drawSeeds, bool, false, "", 0, "Highlight seeds")
 AddOption(drawTracklets, bool, false, "", 0, "Highlight tracklets")
 AddOption(drawTracks, bool, false, "", 0, "Highlight sector tracks")
-AddOption(drawGlobalTracks, bool, false, "", 0, "Highlight global sector tracks prolonged into adjacent sector")
+AddOption(drawExtrapolatedTracks, bool, false, "", 0, "Highlight global sector tracks prolonged into adjacent sector")
 AddOption(drawFinal, bool, false, "", 0, "Highlight final tracks")
 AddOption(excludeClusters, int32_t, 0, "", 0, "Exclude clusters from selected draw objects from display, (2 = exclude clusters but still show tracks)")
 AddOption(drawSlice, int32_t,  -1, "", 0, "Show individual slice")
@@ -349,7 +349,7 @@ AddOption(drawTracksAndFilter, bool, false, "", 0, "Use AND filter instead of OR
 AddOption(propagateLoopers, bool, false, "", 0, "Enabale propagation of loopers")
 AddOption(clustersOnly, bool, false, "", 0, "Visualize clusters only")
 AddOption(clustersOnNominalRow, bool, false, "", 0, "Show clusters at nominal x of pad row for early-transformed data")
-AddOption(separateGlobalTracks, bool, false, "", 0, "Draw track segments propagated to adjacent sectors separately")
+AddOption(separateExtrapolatedTracks, bool, false, "", 0, "Draw track segments propagated to adjacent sectors separately")
 AddOption(splitCETracks, int8_t, -1, "", 0, "Split CE tracks when they cross the central electrode (-1 = for triggered data)")
 AddOption(markClusters, int32_t, 0, "", 0, "Mark clusters")
 AddOption(markFakeClusters, int32_t, 0, "", 0, "Mark fake clusters")

GPU/GPUTracking/Global/GPUChainTracking.h

@@ -233,7 +233,7 @@ class GPUChainTracking : public GPUChain
 
   int32_t ReadEvent(uint32_t iSlice, int32_t threadId);
   void WriteOutput(int32_t iSlice, int32_t threadId);
-  int32_t GlobalTracking(uint32_t iSlice, int32_t threadId, bool synchronizeOutput = true);
+  int32_t ExtrapolationTracking(uint32_t iSlice, int32_t threadId, bool synchronizeOutput = true);
 
   int32_t PrepareProfile();
   int32_t DoProfile();

GPU/GPUTracking/Global/GPUChainTrackingMerger.cxx

@@ -161,11 +161,11 @@ int32_t GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)
 
   runKernel<GPUMemClean16>({{1, -WarpSize(), 0, deviceType, RecoStep::TPCMerging}}, MergerShadowAll.TmpCounter(), 2 * NSLICES * sizeof(*MergerShadowAll.TmpCounter()));
 
-  runKernel<GPUTPCGMMergerLinkGlobalTracks>(GetGridAuto(0, deviceType));
+  runKernel<GPUTPCGMMergerLinkExtrapolatedTracks>(GetGridAuto(0, deviceType));
   runKernel<GPUTPCGMMergerCollect>(GetGridAuto(0, deviceType));
   if (GetProcessingSettings().deterministicGPUReconstruction) {
-    runKernel<GPUTPCGlobalDebugSortKernels, GPUTPCGlobalDebugSortKernels::globalTracks1>({{1, -WarpSize(), 0, deviceType}}, 1);
-    runKernel<GPUTPCGlobalDebugSortKernels, GPUTPCGlobalDebugSortKernels::globalTracks2>({{1, -WarpSize(), 0, deviceType}}, 1);
+    runKernel<GPUTPCGlobalDebugSortKernels, GPUTPCGlobalDebugSortKernels::extrapolatedTracks1>({{1, -WarpSize(), 0, deviceType}}, 1);
+    runKernel<GPUTPCGlobalDebugSortKernels, GPUTPCGlobalDebugSortKernels::extrapolatedTracks2>({{1, -WarpSize(), 0, deviceType}}, 1);
   }
   DoDebugAndDump(RecoStep::TPCMerging, 2048, doGPU, Merger, &GPUTPCGMMerger::DumpCollected, *mDebugFile);
 

GPU/GPUTracking/Global/GPUChainTrackingSliceTracker.cxx

@@ -24,21 +24,13 @@
 
 using namespace o2::gpu;
 
-int32_t GPUChainTracking::GlobalTracking(uint32_t iSlice, int32_t threadId, bool synchronizeOutput)
+int32_t GPUChainTracking::ExtrapolationTracking(uint32_t iSlice, int32_t threadId, bool synchronizeOutput)
 {
-  if (GetProcessingSettings().debugLevel >= 5) {
-    GPUInfo("GPU Tracker running Global Tracking for slice %u on thread %d\n", iSlice, threadId);
-  }
-
-  runKernel<GPUTPCGlobalTracking>({GetGridBlk(256, iSlice % mRec->NStreams()), {iSlice}});
+  runKernel<GPUTPCExtrapolationTracking>({GetGridBlk(256, iSlice % mRec->NStreams()), {iSlice}});
   TransferMemoryResourceLinkToHost(RecoStep::TPCSliceTracking, processors()->tpcTrackers[iSlice].MemoryResCommon(), iSlice % mRec->NStreams());
   if (synchronizeOutput) {
     SynchronizeStream(iSlice % mRec->NStreams());
   }
-
-  if (GetProcessingSettings().debugLevel >= 5) {
-    GPUInfo("GPU Tracker finished Global Tracking for slice %u on thread %d\n", iSlice, threadId);
-  }
   return (0);
 }
 
@@ -254,7 +246,7 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
 
     if (!(doGPU || GetProcessingSettings().debugLevel >= 1) || GetProcessingSettings().trackletSelectorInPipeline) {
       runKernel<GPUTPCTrackletSelector>({GetGridAuto(useStream), {iSlice}});
-      runKernel<GPUTPCGlobalTrackingCopyNumbers>({{1, -ThreadCount(), useStream}, {iSlice}}, 1);
+      runKernel<GPUTPCExtrapolationTrackingCopyNumbers>({{1, -ThreadCount(), useStream}, {iSlice}}, 1);
       if (GetProcessingSettings().deterministicGPUReconstruction) {
         runKernel<GPUTPCSectorDebugSortKernels, GPUTPCSectorDebugSortKernels::sliceTracks>({GetGrid(1, 1, useStream), {iSlice}});
       }
@@ -311,7 +303,7 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
           GPUInfo("Running TPC Tracklet selector (Stream %d, Slice %d to %d)", useStream, iSlice, iSlice + runSlices);
         }
         runKernel<GPUTPCTrackletSelector>({GetGridAuto(useStream), {iSlice, runSlices}});
-        runKernel<GPUTPCGlobalTrackingCopyNumbers>({{1, -ThreadCount(), useStream}, {iSlice}}, runSlices);
+        runKernel<GPUTPCExtrapolationTrackingCopyNumbers>({{1, -ThreadCount(), useStream}, {iSlice}}, runSlices);
         for (uint32_t k = iSlice; k < iSlice + runSlices; k++) {
           if (GetProcessingSettings().deterministicGPUReconstruction) {
             runKernel<GPUTPCSectorDebugSortKernels, GPUTPCSectorDebugSortKernels::sliceTracks>({GetGrid(1, 1, useStream), {k}});
@@ -331,7 +323,7 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
     std::array<bool, NSLICES> transferRunning;
     transferRunning.fill(true);
     if ((GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) || (doGPU && !(GetRecoStepsGPU() & RecoStep::TPCMerging))) {
-      if (param().rec.tpc.globalTracking) {
+      if (param().rec.tpc.extrapolationTracking) {
         mWriteOutputDone.fill(0);
       }
 
@@ -380,14 +372,14 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
         }
         mSliceSelectorReady = iSlice;
 
-        if (param().rec.tpc.globalTracking) {
+        if (param().rec.tpc.extrapolationTracking) {
           for (uint32_t tmpSlice2a = 0; tmpSlice2a <= iSlice; tmpSlice2a++) {
-            uint32_t tmpSlice2 = GPUTPCGlobalTracking::GlobalTrackingSliceOrder(tmpSlice2a);
+            uint32_t tmpSlice2 = GPUTPCExtrapolationTracking::ExtrapolationTrackingSliceOrder(tmpSlice2a);
             uint32_t sliceLeft, sliceRight;
-            GPUTPCGlobalTracking::GlobalTrackingSliceLeftRight(tmpSlice2, sliceLeft, sliceRight);
+            GPUTPCExtrapolationTracking::ExtrapolationTrackingSliceLeftRight(tmpSlice2, sliceLeft, sliceRight);
 
             if (tmpSlice2 <= iSlice && sliceLeft <= iSlice && sliceRight <= iSlice && mWriteOutputDone[tmpSlice2] == 0) {
-              GlobalTracking(tmpSlice2, 0);
+              ExtrapolationTracking(tmpSlice2, 0);
               WriteOutput(tmpSlice2, 0);
               mWriteOutputDone[tmpSlice2] = 1;
             }
@@ -397,18 +389,18 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
         }
       }
     }
-    if (!(GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) && param().rec.tpc.globalTracking) {
+    if (!(GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) && param().rec.tpc.extrapolationTracking) {
       std::vector<bool> blocking(NSLICES * mRec->NStreams());
       for (int32_t i = 0; i < NSLICES; i++) {
         for (int32_t j = 0; j < mRec->NStreams(); j++) {
           blocking[i * mRec->NStreams() + j] = i % mRec->NStreams() == j;
         }
       }
       for (uint32_t iSlice = 0; iSlice < NSLICES; iSlice++) {
-        uint32_t tmpSlice = GPUTPCGlobalTracking::GlobalTrackingSliceOrder(iSlice);
+        uint32_t tmpSlice = GPUTPCExtrapolationTracking::ExtrapolationTrackingSliceOrder(iSlice);
         if (!((GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) || (doGPU && !(GetRecoStepsGPU() & RecoStep::TPCMerging)))) {
           uint32_t sliceLeft, sliceRight;
-          GPUTPCGlobalTracking::GlobalTrackingSliceLeftRight(tmpSlice, sliceLeft, sliceRight);
+          GPUTPCExtrapolationTracking::ExtrapolationTrackingSliceLeftRight(tmpSlice, sliceLeft, sliceRight);
           if (doGPU && !blocking[tmpSlice * mRec->NStreams() + sliceLeft % mRec->NStreams()]) {
             StreamWaitForEvents(tmpSlice % mRec->NStreams(), &mEvents->slice[sliceLeft]);
             blocking[tmpSlice * mRec->NStreams() + sliceLeft % mRec->NStreams()] = true;
@@ -418,7 +410,7 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
             blocking[tmpSlice * mRec->NStreams() + sliceRight % mRec->NStreams()] = true;
           }
         }
-        GlobalTracking(tmpSlice, 0, false);
+        ExtrapolationTracking(tmpSlice, 0, false);
       }
     }
     for (uint32_t iSlice = 0; iSlice < NSLICES; iSlice++) {
@@ -430,8 +422,8 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
     mSliceSelectorReady = NSLICES;
     GPUCA_OPENMP(parallel for if(!doGPU && GetProcessingSettings().ompKernels != 1) num_threads(mRec->SetAndGetNestedLoopOmpFactor(!doGPU, NSLICES)))
     for (uint32_t iSlice = 0; iSlice < NSLICES; iSlice++) {
-      if (param().rec.tpc.globalTracking) {
-        GlobalTracking(iSlice, 0);
+      if (param().rec.tpc.extrapolationTracking) {
+        ExtrapolationTracking(iSlice, 0);
       }
       if (GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) {
         WriteOutput(iSlice, 0);
@@ -440,9 +432,9 @@ int32_t GPUChainTracking::RunTPCTrackingSlices_internal()
     mRec->SetNestedLoopOmpFactor(1);
   }
 
-  if (param().rec.tpc.globalTracking && GetProcessingSettings().debugLevel >= 3) {
+  if (param().rec.tpc.extrapolationTracking && GetProcessingSettings().debugLevel >= 3) {
     for (uint32_t iSlice = 0; iSlice < NSLICES; iSlice++) {
-      GPUInfo("Slice %d - Tracks: Local %d Global %d - Hits: Local %d Global %d", iSlice,
+      GPUInfo("Slice %d - Tracks: Local %d Extrapolated %d - Hits: Local %d Extrapolated %d", iSlice,
               processors()->tpcTrackers[iSlice].CommonMemory()->nLocalTracks, processors()->tpcTrackers[iSlice].CommonMemory()->nTracks, processors()->tpcTrackers[iSlice].CommonMemory()->nLocalTrackHits, processors()->tpcTrackers[iSlice].CommonMemory()->nTrackHits);
     }
   }