GPU TPC: Remove option to write out / start from obsolete TPC sector track data format

Author: davidrohr

GPU/GPUTracking/Base/GPUReconstruction.h

@@ -31,7 +31,6 @@
 #include "GPUOutputControl.h"
 #include "GPUMemoryResource.h"
 #include "GPUConstantMem.h"
-#include "GPUTPCSectorOutput.h"
 #include "GPULogging.h"
 
 namespace o2::its

GPU/GPUTracking/Base/GPUReconstructionCPU.cxx

@@ -18,7 +18,6 @@
 #include "GPUChain.h"
 
 #include "GPUTPCClusterData.h"
-#include "GPUTPCSectorOutput.h"
 #include "GPUTPCSectorOutCluster.h"
 #include "GPUTPCGMMergedTrack.h"
 #include "GPUTPCGMMergedTrackHit.h"

GPU/GPUTracking/Base/GPUReconstructionDeviceBase.cxx

@@ -16,7 +16,6 @@
 #include "GPUReconstructionIncludes.h"
 
 #include "GPUTPCTracker.h"
-#include "GPUTPCSectorOutput.h"
 
 using namespace o2::gpu;
 

GPU/GPUTracking/CMakeLists.txt

@@ -37,7 +37,6 @@ set(SRCS
     SectorTracker/GPUTPCNeighboursCleaner.cxx
     SectorTracker/GPUTPCTracker.cxx
     SectorTracker/GPUTPCTrackingData.cxx
-    SectorTracker/GPUTPCSectorOutput.cxx
     SectorTracker/GPUTPCTrackletConstructor.cxx
     SectorTracker/GPUTPCSectorDebugSortKernels.cxx
     SectorTracker/GPUTPCCreateOccupancyMap.cxx

GPU/GPUTracking/DataTypes/GPUDataTypes.h

@@ -139,7 +139,7 @@ class GPUDataTypes
                              AllRecoSteps = 0x7FFFFFFF,
                              NoRecoStep = 0 };
   enum ENUM_CLASS InOutType { TPCClusters = 1,
-                              TPCSectorTracks = 2,
+                              OBSOLETE = 2,
                               TPCMergedTracks = 4,
                               TPCCompressedClusters = 8,
                               TRDTracklets = 16,

GPU/GPUTracking/Global/GPUChainTracking.cxx

@@ -20,7 +20,6 @@
 #include "GPUChainTracking.h"
 #include "GPUChainTrackingDefs.h"
 #include "GPUTPCClusterData.h"
-#include "GPUTPCSectorOutput.h"
 #include "GPUTPCSectorOutCluster.h"
 #include "GPUTPCGMMergedTrack.h"
 #include "GPUTPCGMMergedTrackHit.h"
@@ -185,7 +184,7 @@ bool GPUChainTracking::ValidateSteps()
     GPUError("Invalid input, TPC Clusterizer needs TPC raw input");
     return false;
   }
-  if ((GetRecoSteps() & GPUDataTypes::RecoStep::TPCMerging) && ((GetRecoStepsInputs() & GPUDataTypes::InOutType::TPCSectorTracks) || (GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) || !(GetRecoSteps() & GPUDataTypes::RecoStep::TPCConversion))) {
+  if ((GetRecoSteps() & GPUDataTypes::RecoStep::TPCMerging) && !(GetRecoSteps() & GPUDataTypes::RecoStep::TPCConversion)) {
     GPUError("Invalid input / output / step, merger cannot read/store sectors tracks and needs TPC conversion");
     return false;
   }
@@ -204,7 +203,7 @@ bool GPUChainTracking::ValidateSteps()
     GPUError("Missing input for TPC Cluster conversion / sector tracking / compression / dEdx: TPC Clusters required");
     return false;
   }
-  if ((GetRecoSteps() & GPUDataTypes::RecoStep::TPCMerging) && !((GetRecoStepsInputs() & GPUDataTypes::InOutType::TPCSectorTracks) || (GetRecoSteps() & GPUDataTypes::RecoStep::TPCSectorTracking))) {
+  if ((GetRecoSteps() & GPUDataTypes::RecoStep::TPCMerging) && !(GetRecoSteps() & GPUDataTypes::RecoStep::TPCSectorTracking)) {
     GPUError("Input for TPC merger missing");
     return false;
   }
@@ -220,10 +219,6 @@ bool GPUChainTracking::ValidateSteps()
     GPUError("TPC Raw / TPC Clusters / TRD Tracklets cannot be output");
     return false;
   }
-  if ((GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) && !(GetRecoSteps() & GPUDataTypes::RecoStep::TPCSectorTracking)) {
-    GPUError("No TPC Sector Tracker Output available");
-    return false;
-  }
   if ((GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCMergedTracks) && !(GetRecoSteps() & GPUDataTypes::RecoStep::TPCMerging)) {
     GPUError("No TPC Merged Track Output available");
     return false;

GPU/GPUTracking/Global/GPUChainTracking.h

@@ -220,7 +220,6 @@ class GPUChainTracking : public GPUChain
 
   GPUChainTracking(GPUReconstruction* rec, uint32_t maxTPCHits = GPUCA_MAX_CLUSTERS, uint32_t maxTRDTracklets = GPUCA_MAX_TRD_TRACKLETS);
 
-  void WriteOutput(int32_t iSector, int32_t threadId);
   int32_t ExtrapolationTracking(uint32_t iSector, int32_t threadId, bool synchronizeOutput = true);
 
   int32_t PrepareProfile();
@@ -280,7 +279,7 @@ class GPUChainTracking : public GPUChain
   // Synchronization and Locks
   eventStruct* mEvents = nullptr;
   volatile int32_t mSectorSelectorReady = 0;
-  std::array<int8_t, NSECTORS> mWriteOutputDone;
+  std::array<int8_t, NSECTORS> mExtrapolationTrackingDone;
 
   std::vector<outputQueueEntry> mOutputQueue;
 

GPU/GPUTracking/Global/GPUChainTrackingIO.cxx

@@ -15,7 +15,6 @@
 #include "GPUChainTracking.h"
 #include "GPUReconstructionIO.h"
 #include "GPUTPCClusterData.h"
-#include "GPUTPCSectorOutput.h"
 #include "GPUTPCSectorOutCluster.h"
 #include "GPUTPCGMMergedTrack.h"
 #include "GPUTPCGMMergedTrackHit.h"

GPU/GPUTracking/Global/GPUChainTrackingSectorTracker.cxx

@@ -242,9 +242,9 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
 
     std::array<bool, NSECTORS> transferRunning;
     transferRunning.fill(true);
-    if ((GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) || (doGPU && !(GetRecoStepsGPU() & RecoStep::TPCMerging))) {
+    if (doGPU && !(GetRecoStepsGPU() & RecoStep::TPCMerging)) { // TODO: This seems pretty obsolete code path, can probably be removed.
       if (param().rec.tpc.extrapolationTracking) {
-        mWriteOutputDone.fill(0);
+        mExtrapolationTrackingDone.fill(0);
       }
 
       uint32_t tmpSector = 0;
@@ -288,18 +288,15 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
             uint32_t sectorLeft, sectorRight;
             GPUTPCExtrapolationTracking::ExtrapolationTrackingSectorLeftRight(tmpSector2, sectorLeft, sectorRight);
 
-            if (tmpSector2 <= iSector && sectorLeft <= iSector && sectorRight <= iSector && mWriteOutputDone[tmpSector2] == 0) {
+            if (tmpSector2 <= iSector && sectorLeft <= iSector && sectorRight <= iSector && mExtrapolationTrackingDone[tmpSector2] == 0) {
               ExtrapolationTracking(tmpSector2, 0);
-              WriteOutput(tmpSector2, 0);
-              mWriteOutputDone[tmpSector2] = 1;
+              mExtrapolationTrackingDone[tmpSector2] = 1;
             }
           }
-        } else {
-          WriteOutput(iSector, 0);
         }
       }
     }
-    if (!(GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) && param().rec.tpc.extrapolationTracking) {
+    if (param().rec.tpc.extrapolationTracking) {
       std::vector<bool> blocking(NSECTORS * mRec->NStreams());
       for (int32_t i = 0; i < NSECTORS; i++) {
         for (int32_t j = 0; j < mRec->NStreams(); j++) {
@@ -308,7 +305,7 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
       }
       for (uint32_t iSector = 0; iSector < NSECTORS; iSector++) {
         uint32_t tmpSector = GPUTPCExtrapolationTracking::ExtrapolationTrackingSectorOrder(iSector);
-        if (!((GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) || (doGPU && !(GetRecoStepsGPU() & RecoStep::TPCMerging)))) {
+        if (!(doGPU && !(GetRecoStepsGPU() & RecoStep::TPCMerging))) {
           uint32_t sectorLeft, sectorRight;
           GPUTPCExtrapolationTracking::ExtrapolationTrackingSectorLeftRight(tmpSector, sectorLeft, sectorRight);
           if (doGPU && !blocking[tmpSector * mRec->NStreams() + sectorLeft % mRec->NStreams()]) {
@@ -334,9 +331,6 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
       if (param().rec.tpc.extrapolationTracking) {
         ExtrapolationTracking(iSector, 0);
       }
-      if (GetRecoStepsOutputs() & GPUDataTypes::InOutType::TPCSectorTracks) {
-        WriteOutput(iSector, 0);
-      }
     });
     mRec->SetNActiveThreadsOuterLoop(1);
   }
@@ -348,12 +342,6 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
     }
   }
 
-  if (GetProcessingSettings().debugMask & 1024 && !GetProcessingSettings().deterministicGPUReconstruction) {
-    for (uint32_t i = 0; i < NSECTORS; i++) {
-      processors()->tpcTrackers[i].DumpOutput(*mDebugFile);
-    }
-  }
-
   if (DoProfile()) {
     return (1);
   }
@@ -372,15 +360,3 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
   mRec->PopNonPersistentMemory(RecoStep::TPCSectorTracking, qStr2Tag("TPCSLTRK"));
   return 0;
 }
-
-void GPUChainTracking::WriteOutput(int32_t iSector, int32_t threadId)
-{
-  if (GetProcessingSettings().debugLevel >= 5) {
-    GPUInfo("Running WriteOutput for sector %d on thread %d\n", iSector, threadId);
-  }
-  processors()->tpcTrackers[iSector].WriteOutputPrepare();
-  processors()->tpcTrackers[iSector].WriteOutput();
-  if (GetProcessingSettings().debugLevel >= 5) {
-    GPUInfo("Finished WriteOutput for sector %d on thread %d\n", iSector, threadId);
-  }
-}

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -42,7 +42,6 @@
 #include "GPUCommonConstants.h"
 
 #include "GPUTPCTrackParam.h"
-#include "GPUTPCSectorOutput.h"
 #include "GPUTPCGMMergedTrack.h"
 #include "GPUParam.h"
 #include "GPUTPCTrackLinearisation.h"