Tracking Developments, DO NOT MERGE

GPU/Common/GPUCommonMath.h

@@ -106,6 +106,7 @@ class GPUCommonMath
   GPUd() constexpr static double Copysignd(double x, double y);
   GPUd() constexpr static float TwoPi() { return 6.2831853f; }
   GPUd() constexpr static float Pi() { return 3.1415927f; }
+  GPUd() constexpr static float Deg2Rad() { return Pi() / 180.f; }
   GPUd() constexpr static float Round(float x);
   GPUd() constexpr static float Floor(float x) { return GPUCA_CHOICE(floorf(x), floorf(x), floor(x)); }
   GPUd() static uint32_t Float2UIntReint(const float& x);

GPU/GPUTracking/Base/GPUParam.cxx

@@ -113,6 +113,7 @@ void GPUParam::UpdateSettings(const GPUSettingsGRP* g, const GPUSettingsProcessi
   if (d) {
     rec.dyn = *d;
   }
+  rec.tpc.nWays = 1 + 2 * ((rec.tpc.mergerInitial3wayFit > 0) + (rec.tpc.mergerInterpolateErrors > 0) + (rec.tpc.rebuildTrackInFit > 0));
 }
 
 void GPUParam::UpdateBzOnly(float newSolenoidBz, bool assumeConstantBz)

GPU/GPUTracking/Base/GPUParam.h

@@ -80,8 +80,8 @@ struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam>
   void UpdateRun3ClusterErrors(const float* yErrorParam, const float* zErrorParam);
 #endif
 
-  GPUd() constexpr uint32_t tpcMinHitsB5(float qPtB5) const { return CAMath::Abs(qPtB5) > 10 ? 10 : (CAMath::Abs(qPtB5) > 5 ? 15 : 29); } // Minimum hits should depend on Pt, low Pt tracks can have few hits. 29 Hits default, 15 for < 200 mev, 10 for < 100 mev
-  GPUd() constexpr float Alpha(int32_t iSector) const                                                                                     // TODO: Check if this is faster, or the lookup from GPUTPCGeometry
+  GPUd() constexpr uint32_t tpcMinHitsB5Abs(float qPtB5) const { return qPtB5 > 10.f ? 10 : (qPtB5 > 5.f ? (uint32_t)(20 - qPtB5) : (qPtB5 > 3.6f ? (uint32_t)(65 - 10.f * qPtB5) : 29)); }
+  GPUd() constexpr float Alpha(int32_t iSector) const // TODO: Check if this is faster, or the lookup from GPUTPCGeometry
   {
     if (iSector >= (int32_t)o2::tpc::constants::MAXSECTOR / 2) {
       iSector -= o2::tpc::constants::MAXSECTOR / 2;

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -295,7 +295,7 @@ int32_t GPUReconstruction::InitPhaseBeforeDevice()
   if (GetProcessingSettings().deterministicGPUReconstruction && GetProcessingSettings().debugLevel >= 6) {
     mProcessingSettings->nTPCClustererLanes = 1;
   }
-  if (GetProcessingSettings().createO2Output > 1 && GetProcessingSettings().runQA && GetProcessingSettings().qcRunFraction == 100.f) {
+  if (GetProcessingSettings().createO2Output > 1 && ((GetProcessingSettings().runQA && GetProcessingSettings().qcRunFraction == 100.f) || GetProcessingSettings().debug.mergerDumpTrackNCl)) {
     mProcessingSettings->createO2Output = 1;
   }
   if (!GetProcessingSettings().createO2Output || !IsGPU()) {

GPU/GPUTracking/Base/GPUReconstructionCPU.cxx

@@ -216,10 +216,10 @@ int32_t GPUReconstructionCPU::ExitDevice()
 int32_t GPUReconstructionCPU::RunChains()
 {
   mMemoryScalers->temporaryFactor = 1.;
-  if (GetProcessingSettings().memoryScalingFuzz) {
+  if (GetProcessingSettings().debug.memoryScalingFuzz) {
     static std::mt19937 rng;
     static std::uniform_int_distribution<uint64_t> dist(0, 1000000);
-    uint64_t fuzzFactor = GetProcessingSettings().memoryScalingFuzz == 1 ? dist(rng) : GetProcessingSettings().memoryScalingFuzz;
+    uint64_t fuzzFactor = GetProcessingSettings().debug.memoryScalingFuzz == 1 ? dist(rng) : GetProcessingSettings().debug.memoryScalingFuzz;
     GPUInfo("Fuzzing memory scaling factor with %lu", fuzzFactor);
     mMemoryScalers->fuzzScalingFactor(fuzzFactor);
   }

GPU/GPUTracking/DataTypes/GPUTPCGeometry.h

@@ -16,7 +16,11 @@
 #define GPUTPCGEOMETRY_H
 
 #include "GPUCommonDef.h"
+#include "GPUCommonMath.h"
 #include "DataFormatsTPC/Constants.h"
+#ifndef GPUCA_GPUCODE_DEVICE
+#include <cmath>
+#endif
 
 namespace o2::gpu
 {
@@ -174,6 +178,8 @@ class GPUTPCGeometry
     const float v = (sector >= NSECTORS / 2) ? -z : z;
     return (250.f - v) * FACTOR_Z2T; // Used in compression, must remain constant at 250cm
   }
+
+  GPUd() static constexpr float kSectAngle() { return 2 * CAMath::Pi() / 18.f; }
 };
 
 } // namespace o2::gpu

GPU/GPUTracking/Definitions/GPUDef.h

@@ -70,16 +70,30 @@
   #ifdef CADEBUG
     #undef CADEBUG
   #endif
-  #if GPUCA_CADEBUG == 1 && !defined(GPUCA_GPUCODE)
-    #define CADEBUG(...) __VA_ARGS__
-    #define CADEBUG2(cmd, ...) {__VA_ARGS__; cmd;}
-    #define GPUCA_CADEBUG_ENABLED
+  #ifdef CADEBUG2
+    #undef CADEBUG2
+  #endif
+  #ifdef CADEBUG3
+    #undef CADEBUG3
+  #endif
+  #if GPUCA_CADEBUG >= 1 && !defined(GPUCA_GPUCODE)
+    #if GPUCA_CADEBUG >= 2
+      #define CADEBUG(...) if (CADEBUG_CONDITION) {__VA_ARGS__;}
+      #define CADEBUG2(cmd, ...) if (CADEBUG_CONDITION) {__VA_ARGS__; cmd;}
+      #define GPUCA_CADEBUG_ENABLED 2
+    #else
+      #define CADEBUG(...) __VA_ARGS__
+      #define CADEBUG2(cmd, ...) {__VA_ARGS__; cmd;}
+      #define GPUCA_CADEBUG_ENABLED 1
+    #endif
+    #define CADEBUG3(...) __VA_ARGS__
   #endif
   #undef GPUCA_CADEBUG
 #endif
 
 #ifndef CADEBUG
   #define CADEBUG(...)
   #define CADEBUG2(cmd, ...) {cmd;}
+  #define CADEBUG3(...)
 #endif
 // clang-format on