GPU: Cleanup obsolete settings and update deprecated CMake variable to new name

GPU/GPUTracking/Base/GPUReconstructionCPU.cxx

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

GPU/GPUTracking/CMakeLists.txt

@@ -155,7 +155,6 @@ set(HDRS_INSTALL
     SectorTracker/GPUTPCHit.h
     SectorTracker/GPUTPCHitId.h
     SectorTracker/GPUTPCMCInfo.h
-    SectorTracker/GPUTPCSectorOutCluster.h
     SectorTracker/GPUTPCTracklet.h
     SectorTracker/GPUTPCTrackLinearisation.h
     TPCConvert/GPUTPCConvertImpl.h

GPU/GPUTracking/DataTypes/GPUTPCGMMergedTrackHit.h

@@ -41,10 +41,6 @@ struct GPUTPCGMMergedTrackHit {
 struct GPUTPCGMMergedTrackHitXYZ {
   float x, y, z;
   uint16_t amp;
-#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
-  float pad;
-  float time;
-#endif
 };
 
 } // namespace o2::gpu

GPU/GPUTracking/Definitions/GPUDef.h

@@ -34,11 +34,7 @@
   #define GPUPtr2(a, b) b
 #endif
 
-#ifdef GPUCA_FULL_CLUSTERDATA
-  #define GPUCA_EVDUMP_FILE "event_full"
-#else
-  #define GPUCA_EVDUMP_FILE "event"
-#endif
+#define GPUCA_EVDUMP_FILE "event_full"
 
 #ifdef GPUCA_GPUCODE
   #define CA_MAKE_SHARED_REF(vartype, varname, varglobal, varshared) const GPUsharedref() vartype& __restrict__ varname = varshared;

GPU/GPUTracking/Definitions/GPUDefConstantsAndSettings.h

@@ -67,9 +67,6 @@
 #endif
 
 //#define GPUCA_MERGER_BY_MC_LABEL                    // Use MC labels for TPC track merging - for performance studies // TODO: Cleanup unneeded options
-//#define GPUCA_FULL_CLUSTERDATA                      // Store all cluster information in the cluster data, also those not needed for tracking.
-//#define GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME        // Propagate Pad, Row, Time cluster information to GM
-//#define GPUCA_GM_USE_FULL_FIELD                     // Use offline magnetic field during GMPropagator prolongation
 
 // clang-format on
 

GPU/GPUTracking/Global/GPUChainTracking.cxx

@@ -22,7 +22,6 @@
 #include "GPUReconstructionIO.h"
 #include "GPUChainTrackingDefs.h"
 #include "GPUTPCClusterData.h"
-#include "GPUTPCSectorOutCluster.h"
 #include "GPUTPCGMMergedTrack.h"
 #include "GPUTPCGMMergedTrackHit.h"
 #include "GPUTPCTrack.h"

GPU/GPUTracking/Global/GPUChainTrackingIO.cxx

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

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -1727,10 +1727,6 @@ GPUd() void GPUTPCGMMerger::CollectMergedTracks(int32_t nBlocks, int32_t nThread
         clXYZ[i].y = c.y;
         clXYZ[i].z = c.z;
         clXYZ[i].amp = c.amp;
-#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
-        clXYZ[i].pad = c.mPad;
-        clXYZ[i].time = c.mTime;
-#endif
         state = c.flags;
       } else {
         const ClusterNative& c = GetConstantMem()->ioPtrs.clustersNative->clustersLinear[trackClusters[i].id];

GPU/GPUTracking/Merger/GPUTPCGMPropagator.cxx

@@ -22,11 +22,6 @@
 #include "GPUDebugStreamer.h"
 #include "GPUTPCGMMerger.h"
 
-#if defined(GPUCA_GM_USE_FULL_FIELD)
-#include "AliTracker.h"
-#include "AliMagF.h"
-#endif
-
 using namespace o2::gpu;
 
 GPUd() void GPUTPCGMPropagator::GetBxByBzBase(float cosAlpha, float sinAlpha, float X, float Y, float Z, float B[3]) const
@@ -36,24 +31,6 @@ GPUd() void GPUTPCGMPropagator::GetBxByBzBase(float cosAlpha, float sinAlpha, fl
   float gx = getGlobalX(cosAlpha, sinAlpha, X, Y);
   float gy = getGlobalY(cosAlpha, sinAlpha, X, Y);
 
-#if defined(GPUCA_GM_USE_FULL_FIELD)
-  const float kCLight = gpu_common_constants::kCLight;
-  double r[3] = {gx, gy, Z};
-  double bb[3];
-  AliTracker::GetBxByBz(r, bb);
-  bb[0] *= kCLight;
-  bb[1] *= kCLight;
-  bb[2] *= kCLight;
-/*
-  cout<<"AliTracker::GetBz()= "<<AliTracker::GetBz()<<endl;
-  cout<<"AliTracker::UniformField() "<<AliTracker::UniformField()<<endl;
-  AliMagF* fld = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
-  cout<<"Fast field = "<<(void*) fld->GetFastField()<<endl;
-  AliMagF::BMap_t  type = fld->GetMapType() ;
-  cout<<"Field type: "<<type<<endl;
-  //  fMapType==k2BMap_t
-*/
-#else
   float bb[3];
   switch (mFieldRegion) {
     case ITS:
@@ -67,8 +44,6 @@ GPUd() void GPUTPCGMPropagator::GetBxByBzBase(float cosAlpha, float sinAlpha, fl
       mField->GetField(gx, gy, Z, bb);
   }
 
-#endif
-
   // rotate field to local coordinates
 
   B[0] = bb[0] * cosAlpha + bb[1] * sinAlpha;
@@ -81,13 +56,6 @@ GPUd() float GPUTPCGMPropagator::GetBzBase(float cosAlpha, float sinAlpha, float
   float gx = getGlobalX(cosAlpha, sinAlpha, X, Y);
   float gy = getGlobalY(cosAlpha, sinAlpha, X, Y);
 
-#if defined(GPUCA_GM_USE_FULL_FIELD)
-  const float kCLight = gpu_common_constants::kCLight;
-  double r[3] = {gx, gy, Z};
-  double bb[3];
-  AliTracker::GetBxByBz(r, bb);
-  return bb[2] * kCLight;
-#else
   switch (mFieldRegion) {
     case ITS:
       return mField->GetFieldItsBz(gx, gy, Z);
@@ -97,7 +65,6 @@ GPUd() float GPUTPCGMPropagator::GetBzBase(float cosAlpha, float sinAlpha, float
     default:
       return mField->GetFieldBz(gx, gy, Z);
   }
-#endif
 }
 
 GPUd() int32_t GPUTPCGMPropagator::RotateToAlpha(float newAlpha)

GPU/GPUTracking/SectorTracker/GPUTPCClusterData.h

@@ -27,13 +27,6 @@ struct GPUTPCClusterData {
   float y;
   float z;
   float amp;
-#ifdef GPUCA_FULL_CLUSTERDATA
-  float pad;
-  float time;
-  float ampMax;
-  float sigmaPad2;
-  float sigmaTime2;
-#endif
 };
 } // namespace o2::gpu
 

GPU/GPUTracking/SectorTracker/GPUTPCDef.h

@@ -33,15 +33,5 @@ typedef uint32_t cahit;
 struct cahit2 { cahit x, y; };
 } // namespace o2::GPU
 
-#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME // Needs full clusterdata
-  #define GPUCA_FULL_CLUSTERDATA
-#endif
-
-#if defined(GPUCA_STANDALONE) || defined(GPUCA_GPUCODE) // No support for Full Field Propagator or Statistical errors
-  #ifdef GPUCA_GM_USE_FULL_FIELD
-    #undef GPUCA_GM_USE_FULL_FIELD
-  #endif
-#endif
-
 #endif //GPUDTPCEF_H
 // clang-format on

GPU/GPUTracking/SectorTracker/GPUTPCTrack.h

@@ -17,7 +17,6 @@
 
 #include "GPUTPCBaseTrackParam.h"
 #include "GPUTPCDef.h"
-#include "GPUTPCSectorOutCluster.h"
 
 namespace o2::gpu
 {
@@ -49,11 +48,6 @@ class GPUTPCTrack
 
   GPUhd() void SetParam(const GPUTPCBaseTrackParam& v) { mParam = v; }
 
-  // Only if used as replacement for SectorOutTrack
-  GPUhd() static int32_t GetSize(int32_t nClust) { return sizeof(GPUTPCTrack) + nClust * sizeof(GPUTPCSectorOutCluster); }
-  GPUhd() const GPUTPCTrack* GetNextTrack() const { return (const GPUTPCTrack*)(((char*)this) + GetSize(mNHits)); }
-  GPUhd() GPUTPCTrack* NextTrack() { return (GPUTPCTrack*)(((char*)this) + GetSize(mNHits)); }
-
  private:
   int32_t mFirstHitID;         // index of the first track cell in the track->cell pointer array
   int32_t mNHits;              // number of track cells

GPU/GPUTracking/TPCConvert/GPUTPCConvertKernel.cxx

@@ -44,9 +44,5 @@ GPUdii() void GPUTPCConvertKernel::Thread<0>(int32_t nBlocks, int32_t nThreads,
     clout.amp = clin.qTot;
     clout.flags = clin.getFlags();
     clout.id = idOffset + k;
-#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
-    clout.pad = clin.getPad();
-    clout.time = clin.getTime();
-#endif
   }
 }

dependencies/FindO2GPU.cmake

@@ -234,7 +234,7 @@ endif()
 if(ENABLE_HIP)
   if(HIP_AMDGPUTARGET)
     set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}")
-    set(AMDGPU_TARGETS "${HIP_AMDGPUTARGET}")
+    set(GPU_TARGETS "${HIP_AMDGPUTARGET}")
   endif()
   if(NOT "$ENV{CMAKE_PREFIX_PATH}" MATCHES "rocm" AND NOT CMAKE_PREFIX_PATH MATCHES "rocm" AND EXISTS "/opt/rocm/lib/cmake/")
     list(APPEND CMAKE_PREFIX_PATH "/opt/rocm/lib/cmake")