TPC Workflow / Tracking: Remove dead codee

Author: davidrohr

Detectors/TPC/reconstruction/include/TPCReconstruction/GPUCATracking.h

@@ -58,7 +58,6 @@ class GPUCATracking
   //Input: cluster structure, possibly including MC labels, pointers to std::vectors for tracks and track MC labels. outputTracksMCTruth may be nullptr to indicate missing cluster MC labels. Otherwise, cluster MC labels are assumed to be present.
   int runTracking(o2::gpu::GPUO2InterfaceIOPtrs* data, o2::gpu::GPUInterfaceOutputs* outputs = nullptr);
 
-  float getPseudoVDrift();                                              //Return artificial VDrift used to convert time to Z
   void GetClusterErrors2(int row, float z, float sinPhi, float DzDs, short clusterState, float& ErrY2, float& ErrZ2) const;
 
   int registerMemoryForGPU(const void* ptr, size_t size);

Detectors/TPC/reconstruction/src/GPUCATracking.cxx

@@ -13,17 +13,10 @@
 
 #include "TPCReconstruction/GPUCATracking.h"
 
-#include "FairLogger.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "SimulationDataFormat/ConstMCTruthContainer.h"
-#include "TChain.h"
-#include "TClonesArray.h"
-#include "TPCBase/Mapper.h"
 #include "TPCBase/PadRegionInfo.h"
-#include "TPCBase/ParameterDetector.h"
-#include "TPCBase/ParameterElectronics.h"
-#include "TPCBase/ParameterGas.h"
 #include "TPCBase/Sector.h"
 #include "DataFormatsTPC/Digit.h"
 #include "DataFormatsTPC/ClusterNativeHelper.h"
@@ -84,11 +77,6 @@ int GPUCATracking::runTracking(GPUO2InterfaceIOPtrs* data, GPUInterfaceOutputs*
     LOG(ERROR) << "Output tracks or clusRefs vectors are not initialized";
     return 0;
   }
-  auto& detParam = ParameterDetector::Instance();
-  auto& gasParam = ParameterGas::Instance();
-  auto& elParam = ParameterElectronics::Instance();
-  float vzbin = (elParam.ZbinWidth * gasParam.DriftV);
-  Mapper& mapper = Mapper::instance();
 
   std::vector<o2::tpc::Digit> gpuDigits[Sector::MAXSECTOR];
   o2::dataformats::MCTruthContainer<o2::MCCompLabel> gpuDigitsMC[Sector::MAXSECTOR];
@@ -245,9 +233,6 @@ int GPUCATracking::runTracking(GPUO2InterfaceIOPtrs* data, GPUInterfaceOutputs*
       int globalRow = trackClusters[tracks[i].FirstClusterRef() + j].row;
       int clusterIdInRow = clusterIdGlobal - data->clusters->clusterOffset[sector][globalRow];
       int regionNumber = 0;
-      while (globalRow > mapper.getGlobalRowOffsetRegion(regionNumber) + mapper.getNumberOfRowsRegion(regionNumber)) {
-        regionNumber++;
-      }
       clIndArr[nOutCl2] = clusterIdInRow;
       sectorIndexArr[nOutCl2] = sector;
       rowIndexArr[nOutCl2] = globalRow;
@@ -317,13 +302,6 @@ int GPUCATracking::runTracking(GPUO2InterfaceIOPtrs* data, GPUInterfaceOutputs*
   return (retVal);
 }
 
-float GPUCATracking::getPseudoVDrift()
-{
-  auto& gasParam = ParameterGas::Instance();
-  auto& elParam = ParameterElectronics::Instance();
-  return (elParam.ZbinWidth * gasParam.DriftV);
-}
-
 void GPUCATracking::GetClusterErrors2(int row, float z, float sinPhi, float DzDs, short clusterState, float& ErrY2, float& ErrZ2) const
 {
   if (mTrackingCAO2Interface == nullptr) {

Detectors/TPC/workflow/src/CATrackerSpec.cxx

@@ -26,7 +26,6 @@
 #include "Framework/Logger.h"
 #include "Framework/CallbackService.h"
 #include "DataFormatsTPC/TPCSectorHeader.h"
-#include "DataFormatsTPC/ClusterGroupAttribute.h"
 #include "DataFormatsTPC/ClusterNative.h"
 #include "DataFormatsTPC/CompressedClusters.h"
 #include "DataFormatsTPC/Helpers.h"

GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h

@@ -131,15 +131,6 @@ struct GPUO2InterfaceIOPtrs {
 
   // Output for entropy-reduced clusters of TPC compression
   const o2::tpc::CompressedClustersFlat* compressedClusters = nullptr;
-
-  // Hint for GPUCATracking to place its output in this buffer if possible.
-  // This enables to create the output directly in a shared memory segment of the framework.
-  // This allows further processing with zero-copy.
-  // So far this is only a hint, GPUCATracking will not always follow.
-  // If outputBuffer = nullptr, GPUCATracking will allocate the output internally and own the memory.
-  // TODO: Make this mandatory if outputBuffer != nullptr, and throw an error if outputBufferSize is too small.
-  void* outputBuffer = nullptr;
-  size_t outputBufferSize = 0;
 };
 } // namespace gpu
 } // namespace o2

macro/CMakeLists.txt

@@ -32,7 +32,6 @@ install(FILES CheckDigits_mft.C
               readEMCHits.C
               readITSDigits.C
               rootlogon.C
-              runCATrackingClusterNative.C
               runTPCRefit.C
               run_CRUDataSkimming_its.C
               run_calib_tof.C
@@ -231,13 +230,6 @@ o2_add_test_root_macro(readITSDigits.C
                                              O2::SimulationDataFormat
                        LABELS its)
 
-# FIXME: move to subsystem dir
-o2_add_test_root_macro(runCATrackingClusterNative.C
-                       PUBLIC_LINK_LIBRARIES O2::DataFormatsTPC
-                                             O2::ReconstructionDataFormats
-                                             O2::SimulationDataFormat
-                                             O2::TPCReconstruction
-LABELS tpc)
 # FIXME: move to subsystem dir
 o2_add_test_root_macro(runTPCRefit.C
                        PUBLIC_LINK_LIBRARIES O2::DataFormatsTPC