GPU: Move some functionality to CAMath

Author: davidrohr

GPU/Common/GPUCommonMath.h

@@ -95,6 +95,7 @@ class GPUCommonMath
   GPUhdni() constexpr static float Copysign(float x, float y) { return GPUCA_CHOICE(std::copysignf(x, y), copysignf(x, y), copysign(x, 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/DataTypes/GPUTPCGeometry.h

@@ -16,6 +16,7 @@
 #define GPUTPCGEOMETRY_H
 
 #include "GPUCommonDef.h"
+#include "GPUCommonMath.h"
 
 #if !defined(GPUCA_NSECTORS) && !defined(GPUCA_ROW_COUNT)
 #include "DataFormatsTPC/Constants.h"
@@ -145,7 +146,7 @@ class GPUTPCGeometry // TODO: Make values constexpr
     return (250.f - v) * FACTOR_Z2T; // Used in compression, must remain constant at 250cm
   }
 
-  GPUd() static constexpr float kSectAngle() { return 2 * M_PI / 18.f; }
+  GPUd() static constexpr float kSectAngle() { return 2 * CAMath::Pi() / 18.f; }
 };
 
 } // namespace o2::gpu

GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx

@@ -279,8 +279,7 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
     uncorrectedY = AttachClusters(merger, cluster.sector, cluster.row, iTrk, track.Leg() == 0, prop);
   }
 
-  static constexpr float kDeg2Rad = M_PI / 180.f;
-  const float maxSinForUpdate = CAMath::Sin(70.f * kDeg2Rad);
+  const float maxSinForUpdate = CAMath::Sin(70.f * CAMath::Deg2Rad());
   const bool sinPhiErr = mNDF > 0 && CAMath::Abs(prop.GetSinPhi0()) >= maxSinForUpdate;
   if (mNDF >= 0 && (mC[0] > param.rec.tpc.trackFitCovLimit || mC[2] > param.rec.tpc.trackFitCovLimit)) {
     return 1; // bad chi2 for the whole track, stop the fit
@@ -528,13 +527,11 @@ GPUdii() void GPUTPCGMTrackParam::DodEdx(GPUdEdx& GPUrestrict() dEdx, GPUdEdx& G
 
 GPUdni() void GPUTPCGMTrackParam::MoveToReference(GPUTPCGMPropagator& GPUrestrict() prop, const GPUParam& GPUrestrict() param, float& GPUrestrict() Alpha)
 {
-  static constexpr float kDeg2Rad = M_PI / 180.f;
-
   if (param.rec.tpc.trackReferenceX <= 500) {
     GPUTPCGMTrackParam save = *this;
     float saveAlpha = Alpha;
     for (int32_t attempt = 0; attempt < 3; attempt++) {
-      float dAngle = CAMath::Round(CAMath::ATan2(mP[0], mX) / kDeg2Rad / 20.f) * GPUTPCGeometry::kSectAngle();
+      float dAngle = CAMath::Round(CAMath::ATan2(mP[0], mX) / CAMath::Deg2Rad() / 20.f) * GPUTPCGeometry::kSectAngle();
       Alpha += dAngle;
       if (prop.PropagateToXAlpha(param.rec.tpc.trackReferenceX, Alpha, 0)) {
         break;
@@ -548,7 +545,7 @@ GPUdni() void GPUTPCGMTrackParam::MoveToReference(GPUTPCGMPropagator& GPUrestric
     Alpha = saveAlpha;
   }
   if (CAMath::Abs(mP[0]) > mX * CAMath::Tan(GPUTPCGeometry::kSectAngle() / 2.f)) {
-    float dAngle = CAMath::Round(CAMath::ATan2(mP[0], mX) / kDeg2Rad / 20.f) * GPUTPCGeometry::kSectAngle();
+    float dAngle = CAMath::Round(CAMath::ATan2(mP[0], mX) / CAMath::Deg2Rad() / 20.f) * GPUTPCGeometry::kSectAngle();
     Rotate(dAngle);
     ConstrainSinPhi();
     Alpha += dAngle;

GPU/GPUTracking/Refit/GPUTrackingRefit.cxx

@@ -398,11 +398,10 @@ GPUd() int32_t GPUTrackingRefit::RefitTrack(T& trkX, bool outward, bool resetCov
     trk.NormalizeAlpha(alpha);
     prop.SetAlpha(alpha);
   } else if constexpr (std::is_same_v<S, TrackParCov>) {
-    static constexpr float kDeg2Rad = M_PI / 180.f;
     if (mPparam->rec.tpc.trackReferenceX <= 500) {
       if (prop->PropagateToXBxByBz(trk, mPparam->rec.tpc.trackReferenceX)) {
         if (CAMath::Abs(trk.getY()) > trk.getX() * CAMath::Tan(GPUTPCGeometry::kSectAngle() / 2.f)) {
-          float newAlpha = trk.getAlpha() + CAMath::Round(CAMath::ATan2(trk.getY(), trk.getX()) / kDeg2Rad / 20.f) * GPUTPCGeometry::kSectAngle();
+          float newAlpha = trk.getAlpha() + CAMath::Round(CAMath::ATan2(trk.getY(), trk.getX()) / CAMath::Deg2Rad() / 20.f) * GPUTPCGeometry::kSectAngle();
           GPUTPCGMTrackParam::NormalizeAlpha(newAlpha);
           trk.rotate(newAlpha) && prop->PropagateToXBxByBz(trk, mPparam->rec.tpc.trackReferenceX);
         }

GPU/GPUTracking/TRDTracking/GPUTRDInterfaces.h

@@ -147,7 +147,7 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
   GPUd() float getSnp() const { return GetSinPhi(); }
   GPUd() float getTgl() const { return GetDzDs(); }
   GPUd() float getQ2Pt() const { return GetQPt(); }
-  GPUd() float getEta() const { return -CAMath::Log(CAMath::Tan(0.5f * (0.5f * M_PI - CAMath::ATan(getTgl())))); }
+  GPUd() float getEta() const { return -CAMath::Log(CAMath::Tan(0.5f * (0.5f * CAMath::Pi() - CAMath::ATan(getTgl())))); }
   GPUd() float getPt() const { return CAMath::Abs(getQ2Pt()) > 0 ? CAMath::Abs(1.f / getQ2Pt()) : 99999.f; }
   GPUd() float getSigmaY2() const { return GetErr2Y(); }
   GPUd() float getSigmaZ2() const { return GetErr2Z(); }

GPU/GPUTracking/qa/GPUQA.cxx

@@ -181,7 +181,7 @@ static const constexpr int32_t COLORS_HEX[COLORCOUNT] = {0xB03030, 0x00A000, 0x0
 static const constexpr int32_t CONFIG_DASHED_MARKERS = 0;
 
 static const constexpr float AXES_MIN[5] = {-Y_MAX, -Z_MAX, 0.f, -ETA_MAX, PT_MIN};
-static const constexpr float AXES_MAX[5] = {Y_MAX, Z_MAX, 2.f * M_PI, ETA_MAX, PT_MAX};
+static const constexpr float AXES_MAX[5] = {Y_MAX, Z_MAX, 2.f * CAMath::Pi(), ETA_MAX, PT_MAX};
 static const constexpr int32_t AXIS_BINS[5] = {51, 51, 144, 31, 50};
 static const constexpr int32_t RES_AXIS_BINS[] = {1017, 113}; // Consecutive bin sizes, histograms are binned down until the maximum entry is 50, each bin size should evenly divide its predecessor.
 static const constexpr float RES_AXES[5] = {1., 1., 0.03, 0.03, 1.0};
@@ -1197,12 +1197,12 @@ void GPUQA::RunQA(bool matchOnly, const std::vector<o2::tpc::TrackTPC>* tracksEx
         const mcInfo_t& info = GetMCTrack(i, iCol);
         additionalMCParameters& mc2 = mMCParam[iCol][i];
         mc2.pt = std::sqrt(info.pX * info.pX + info.pY * info.pY);
-        mc2.phi = M_PI + std::atan2(-info.pY, -info.pX);
+        mc2.phi = CAMath::Pi() + std::atan2(-info.pY, -info.pX);
         float p = info.pX * info.pX + info.pY * info.pY + info.pZ * info.pZ;
         if (p < 1e-18) {
           mc2.theta = mc2.eta = 0.f;
         } else {
-          mc2.theta = info.pZ == 0 ? (M_PI / 2) : (std::acos(info.pZ / std::sqrt(p)));
+          mc2.theta = info.pZ == 0 ? (CAMath::Pi() / 2) : (std::acos(info.pZ / std::sqrt(p)));
           mc2.eta = -std::log(std::tan(0.5 * mc2.theta));
         }
         if (mConfig.writeMCLabels) {
@@ -1256,10 +1256,10 @@ void GPUQA::RunQA(bool matchOnly, const std::vector<o2::tpc::TrackTPC>* tracksEx
           }
 
           float alpha = std::atan2(info.y, info.x);
-          alpha /= M_PI / 9.f;
+          alpha /= CAMath::Pi() / 9.f;
           alpha = std::floor(alpha);
-          alpha *= M_PI / 9.f;
-          alpha += M_PI / 18.f;
+          alpha *= CAMath::Pi() / 9.f;
+          alpha += CAMath::Pi() / 18.f;
 
           float c = std::cos(alpha);
           float s = std::sin(alpha);

GPU/GPUTracking/qa/genEvents.cxx

@@ -200,8 +200,8 @@ int32_t genEvents::GenerateEvent(const GPUParam& param, const char* filename)
     double eta = gRandom->Uniform(-1.5, 1.5);
 
     double theta = 2 * std::atan(1. / exp(eta));
-    double lambda = theta - M_PI / 2;
-    // double theta = gRandom->Uniform(-60,60)*M_PI/180.;
+    double lambda = theta - CAMath::Pi() / 2;
+    // double theta = gRandom->Uniform(-60,60)*CAMath::Pi()/180.;
     double pt = .08 * std::pow(10, gRandom->Uniform(0, 2.2));
 
     double q = 1.;

GPU/GPUTracking/qa/genEvents.h

@@ -16,7 +16,7 @@
 #define GENEVENTS_H
 
 #include "GPUCommonDef.h"
-#include <cmath>
+#include "GPUCommonMath.h"
 
 namespace o2::gpu
 {
@@ -66,7 +66,7 @@ class genEvents
     uint32_t id;
   };
 
-  const double mTwoPi = 2 * M_PI;
+  const double mTwoPi = 2 * CAMath::Pi();
   const double mSectorDAngle = mTwoPi / 18.;
   const double mSectorAngleOffset = mSectorDAngle / 2;