GPU: Remove obsolete GPUCA_GM_USE_FULL_FIELD

Author: davidrohr

GPU/GPUTracking/Definitions/GPUDefConstantsAndSettings.h

@@ -67,7 +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_GM_USE_FULL_FIELD                     // Use offline magnetic field during GMPropagator prolongation
 
 // clang-format on
 

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/GPUTPCDef.h

@@ -33,12 +33,5 @@ typedef uint32_t cahit;
 struct cahit2 { cahit x, y; };
 } // namespace o2::GPU
 
-
-#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