Skip to content

Commit cc905dd

Browse files
davidrohrdavidrohr
committed
GPU: Use float CAMath::Pi() instead of M_PI, which is double
1 parent f85b892 commit cc905dd

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎GPU/GPUTracking/Merger/GPUTPCGMPropagator.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -940,12 +940,12 @@ GPUd() void GPUTPCGMPropagator::Rotate180()
940940
mT->QPt() = -mT->QPt();
941941
mT->DzDs() = -mT->DzDs();
942942

943-
mAlpha = mAlpha + M_PI;
944-
while (mAlpha >= M_PI) {
945-
mAlpha -= 2 * M_PI;
943+
mAlpha = mAlpha + CAMath::Pi();
944+
while (mAlpha >= CAMath::Pi()) {
945+
mAlpha -= CAMath::TwoPi();
946946
}
947-
while (mAlpha < -M_PI) {
948-
mAlpha += 2 * M_PI;
947+
while (mAlpha < -CAMath::Pi()) {
948+
mAlpha += CAMath::TwoPi();
949949
}
950950
mCosAlpha = -mCosAlpha;
951951
mSinAlpha = -mSinAlpha;

‎GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ GPUdic(0, 1) int GPUTPCGMTrackParam::FollowCircle(const GPUTPCGMMerger* GPUrestr
655655
bool right;
656656
float dAlpha = toAlpha - prop.GetAlpha();
657657
if (CAMath::Abs(dAlpha) > 0.001f) {
658-
right = CAMath::Abs(dAlpha) < M_PI ? (dAlpha > 0) : (dAlpha < 0);
658+
right = CAMath::Abs(dAlpha) < CAMath::Pi() ? (dAlpha > 0) : (dAlpha < 0);
659659
} else {
660660
right = toY > mP[0];
661661
}
@@ -667,16 +667,16 @@ GPUdic(0, 1) int GPUTPCGMTrackParam::FollowCircle(const GPUTPCGMMerger* GPUrestr
667667
// clang-format on
668668

669669
AttachClustersPropagate(Merger, slice, iRow, targetRow, iTrack, false, prop, inFlyDirection, 0.7f);
670-
if (prop.RotateToAlpha(prop.GetAlpha() + (M_PI / 2.f) * lrFactor)) {
670+
if (prop.RotateToAlpha(prop.GetAlpha() + (CAMath::Pi() / 2.f) * lrFactor)) {
671671
return 1;
672672
}
673-
CADEBUG(printf("Rotated: X %f Y %f Z %f SinPhi %f (Alpha %f / %f)\n", mP[0], mX, mP[1], mP[2], prop.GetAlpha(), prop.GetAlpha() + M_PI / 2.f));
673+
CADEBUG(printf("Rotated: X %f Y %f Z %f SinPhi %f (Alpha %f / %f)\n", mP[0], mX, mP[1], mP[2], prop.GetAlpha(), prop.GetAlpha() + CAMath::Pi() / 2.f));
674674
while (slice != toSlice || FollowCircleChk(lrFactor, toY, toX, up, right)) {
675675
while ((slice != toSlice) ? (CAMath::Abs(mX) <= CAMath::Abs(mP[0]) * CAMath::Tan(kSectAngle / 2.f)) : FollowCircleChk(lrFactor, toY, toX, up, right)) {
676676
int err = prop.PropagateToXAlpha(mX + 1.f, prop.GetAlpha(), inFlyDirection);
677677
if (err) {
678678
CADEBUG(printf("propagation error (%d)\n", err));
679-
prop.RotateToAlpha(prop.GetAlpha() - (M_PI / 2.f) * lrFactor);
679+
prop.RotateToAlpha(prop.GetAlpha() - (CAMath::Pi() / 2.f) * lrFactor);
680680
return 1;
681681
}
682682
CADEBUG(printf("Propagated to y = %f: X %f Z %f SinPhi %f\n", mX, mP[0], mP[1], mP[2]));
@@ -701,17 +701,17 @@ GPUdic(0, 1) int GPUTPCGMTrackParam::FollowCircle(const GPUTPCGMMerger* GPUrestr
701701
}
702702
}
703703
CADEBUG(printf("Rotating to slice %d\n", slice));
704-
if (prop.RotateToAlpha(param.Alpha(slice) + (M_PI / 2.f) * lrFactor)) {
704+
if (prop.RotateToAlpha(param.Alpha(slice) + (CAMath::Pi() / 2.f) * lrFactor)) {
705705
CADEBUG(printf("rotation error\n"));
706-
prop.RotateToAlpha(prop.GetAlpha() - (M_PI / 2.f) * lrFactor);
706+
prop.RotateToAlpha(prop.GetAlpha() - (CAMath::Pi() / 2.f) * lrFactor);
707707
return 1;
708708
}
709709
CADEBUG(printf("After Rotatin Alpha %f Position X %f Y %f Z %f SinPhi %f\n", prop.GetAlpha(), mP[0], mX, mP[1], mP[2]));
710710
}
711711
}
712712
CADEBUG(printf("Rotating back\n"));
713713
for (int i = 0; i < 2; i++) {
714-
if (prop.RotateToAlpha(prop.GetAlpha() + (M_PI / 2.f) * lrFactor) == 0) {
714+
if (prop.RotateToAlpha(prop.GetAlpha() + (CAMath::Pi() / 2.f) * lrFactor) == 0) {
715715
break;
716716
}
717717
if (i) {

‎GPU/GPUTracking/Merger/GPUTPCGMTrackParam.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ class GPUTPCGMTrackParam
181181
}
182182
GPUdi() static void NormalizeAlpha(float& alpha)
183183
{
184-
if (alpha > M_PI) {
185-
alpha -= 2 * M_PI;
186-
} else if (alpha <= -M_PI) {
187-
alpha += 2 * M_PI;
184+
if (alpha > CAMath::Pi()) {
185+
alpha -= CAMath::TwoPi();
186+
} else if (alpha <= -CAMath::Pi()) {
187+
alpha += CAMath::TwoPi();
188188
}
189189
}
190190

‎GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::FollowProlongation(PROP* prop, TRDTRK
664664
int currIdx = candidateIdxOffset + iLayer % 2;
665665
int nextIdx = candidateIdxOffset + (iLayer + 1) % 2;
666666
pad = mGeo->GetPadPlane(iLayer, 0);
667-
float tilt = CAMath::Tan(M_PI / 180.f * pad->GetTiltingAngle()); // tilt is signed!
667+
float tilt = CAMath::Tan(CAMath::Pi() / 180.f * pad->GetTiltingAngle()); // tilt is signed!
668668
const float zMaxTRD = pad->GetRow0();
669669

670670
// --------------------------------------------------------------------------------
@@ -1125,10 +1125,10 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::AdjustSector(PROP* prop, TRDTRK* t) c
11251125
}
11261126
int sign = (y > 0) ? 1 : -1;
11271127
float alphaNew = alphaCurr + alpha * sign;
1128-
if (alphaNew > M_PI) {
1129-
alphaNew -= 2 * M_PI;
1130-
} else if (alphaNew < -M_PI) {
1131-
alphaNew += 2 * M_PI;
1128+
if (alphaNew > CAMath::Pi()) {
1129+
alphaNew -= 2 * CAMath::Pi();
1130+
} else if (alphaNew < -CAMath::Pi()) {
1131+
alphaNew += 2 * CAMath::Pi();
11321132
}
11331133
if (!prop->rotate(alphaNew)) {
11341134
return false;
@@ -1149,11 +1149,11 @@ GPUd() int GPUTRDTracker_t<TRDTRK, PROP>::GetSector(float alpha) const
11491149
// TRD sector number for reference system alpha
11501150
//--------------------------------------------------------------------
11511151
if (alpha < 0) {
1152-
alpha += 2.f * M_PI;
1153-
} else if (alpha >= 2.f * M_PI) {
1154-
alpha -= 2.f * M_PI;
1152+
alpha += 2.f * CAMath::Pi();
1153+
} else if (alpha >= 2.f * CAMath::Pi()) {
1154+
alpha -= 2.f * CAMath::Pi();
11551155
}
1156-
return (int)(alpha * kNSectors / (2.f * M_PI));
1156+
return (int)(alpha * kNSectors / (2.f * CAMath::Pi()));
11571157
}
11581158

11591159
template <class TRDTRK, class PROP>
@@ -1162,9 +1162,9 @@ GPUd() float GPUTRDTracker_t<TRDTRK, PROP>::GetAlphaOfSector(const int sec) cons
11621162
//--------------------------------------------------------------------
11631163
// rotation angle for TRD sector sec
11641164
//--------------------------------------------------------------------
1165-
float alpha = 2.0f * M_PI / (float)kNSectors * ((float)sec + 0.5f);
1166-
if (alpha > M_PI) {
1167-
alpha -= 2 * M_PI;
1165+
float alpha = 2.0f * CAMath::Pi() / (float)kNSectors * ((float)sec + 0.5f);
1166+
if (alpha > CAMath::Pi()) {
1167+
alpha -= 2 * CAMath::Pi();
11681168
}
11691169
return alpha;
11701170
}

‎GPU/GPUTracking/display/GPUDisplay.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void GPUDisplay::SetCollisionFirstCluster(unsigned int collision, int slice, int
192192

193193
void GPUDisplay::mAnimationCloseAngle(float& newangle, float lastAngle)
194194
{
195-
const float delta = lastAngle > newangle ? (2 * M_PI) : (-2 * M_PI);
195+
const float delta = lastAngle > newangle ? (2 * CAMath::Pi()) : (-2 * CAMath::Pi());
196196
while (fabsf(newangle + delta - lastAngle) < fabsf(newangle - lastAngle)) {
197197
newangle += delta;
198198
}
@@ -1039,7 +1039,7 @@ void GPUDisplay::DrawFinal(int iSlice, int /*iCol*/, GPUTPCGMPropagator* prop, s
10391039
}
10401040
x = trkParam.X() + 1.f;
10411041
if (!mPropagateLoopers) {
1042-
float diff = fabsf(alpha - param().Alpha(slice)) / (2. * M_PI);
1042+
float diff = fabsf(alpha - param().Alpha(slice)) / (2. * CAMath::Pi());
10431043
diff -= floor(diff);
10441044
if (diff > 0.25 && diff < 0.75) {
10451045
break;
@@ -1135,7 +1135,7 @@ GPUDisplay::vboList GPUDisplay::DrawGridTRD(int sector)
11351135
int trdsector = NSLICES / 2 - 1 - sector;
11361136
float alpha = geo->GetAlpha() / 2.f + geo->GetAlpha() * trdsector;
11371137
if (trdsector >= 9) {
1138-
alpha -= 2 * M_PI;
1138+
alpha -= 2 * CAMath::Pi();
11391139
}
11401140
for (int iLy = 0; iLy < GPUTRDTracker::EGPUTRDTracker::kNLayers; ++iLy) {
11411141
for (int iStack = 0; iStack < GPUTRDTracker::EGPUTRDTracker::kNStacks; ++iStack) {
@@ -1433,7 +1433,7 @@ int GPUDisplay::DrawGLScene_internal(bool mixAnimation, float mAnimateTime)
14331433
if (mCfg.animationMode != 6) {
14341434
if (mCfg.animationMode & 1) // Rotation from euler angles
14351435
{
1436-
nextViewMatrix = nextViewMatrix * HMM_Rotate(-vals[4] * 180.f / M_PI, {1, 0, 0}) * HMM_Rotate(vals[5] * 180.f / M_PI, {0, 1, 0}) * HMM_Rotate(-vals[6] * 180.f / M_PI, {0, 0, 1});
1436+
nextViewMatrix = nextViewMatrix * HMM_Rotate(-vals[4] * 180.f / CAMath::Pi(), {1, 0, 0}) * HMM_Rotate(vals[5] * 180.f / CAMath::Pi(), {0, 1, 0}) * HMM_Rotate(-vals[6] * 180.f / CAMath::Pi(), {0, 0, 1});
14371437
} else { // Rotation from quaternion
14381438
const float mag = sqrtf(vals[4] * vals[4] + vals[5] * vals[5] + vals[6] * vals[6] + vals[7] * vals[7]);
14391439
if (mag < 0.0001) {
@@ -1536,7 +1536,7 @@ int GPUDisplay::DrawGLScene_internal(bool mixAnimation, float mAnimateTime)
15361536
phi += moveX * 0.1f;
15371537
float theta = atan2f(mXYZ[1], r2);
15381538
theta -= moveY * 0.1f;
1539-
const float max_theta = M_PI / 2 - 0.01;
1539+
const float max_theta = CAMath::Pi() / 2 - 0.01;
15401540
if (theta >= max_theta) {
15411541
theta = max_theta;
15421542
} else if (theta <= -max_theta) {
@@ -1571,7 +1571,7 @@ int GPUDisplay::DrawGLScene_internal(bool mixAnimation, float mAnimateTime)
15711571
nextViewMatrix = nextViewMatrix * mViewMatrix; // Apply previous translation / rotation
15721572
if (yUp) {
15731573
calcXYZ(&nextViewMatrix.Elements[0][0]);
1574-
nextViewMatrix = HMM_Rotate(mAngle[2] * 180.f / M_PI, {0, 0, 1}) * nextViewMatrix;
1574+
nextViewMatrix = HMM_Rotate(mAngle[2] * 180.f / CAMath::Pi(), {0, 0, 1}) * nextViewMatrix;
15751575
}
15761576
if (rotateModel) {
15771577
if (rotYaw != 0.f) {
@@ -1744,9 +1744,9 @@ int GPUDisplay::DrawGLScene_internal(bool mixAnimation, float mAnimateTime)
17441744

17451745
float alpha = atan2f(mc.y, mc.x);
17461746
if (alpha < 0) {
1747-
alpha += 2 * M_PI;
1747+
alpha += 2 * CAMath::Pi();
17481748
}
1749-
int slice = alpha / (2 * M_PI) * 18;
1749+
int slice = alpha / (2 * CAMath::Pi()) * 18;
17501750
if (mc.z < 0) {
17511751
slice += 18;
17521752
}
@@ -2124,8 +2124,8 @@ int GPUDisplay::DrawGLScene_internal(bool mixAnimation, float mAnimateTime)
21242124
sprintf(info,
21252125
"FPS: %6.2f (Slice: %d, 1:Clusters %d, 2:Prelinks %d, 3:Links %d, 4:Seeds %d, 5:Tracklets %d, 6:Tracks %d, 7:GTracks %d, 8:Merger %d) (%d frames, %d draw calls) "
21262126
"(X %1.2f Y %1.2f Z %1.2f / R %1.2f Phi %1.1f Theta %1.1f) / Yaw %1.1f Pitch %1.1f Roll %1.1f)",
2127-
fps, mCfg.drawSlice, mCfg.drawClusters, mCfg.drawInitLinks, mCfg.drawLinks, mCfg.drawSeeds, mCfg.drawTracklets, mCfg.drawTracks, mCfg.drawGlobalTracks, mCfg.drawFinal, mFramesDone, mNDrawCalls, mXYZ[0], mXYZ[1], mXYZ[2], mRPhiTheta[0], mRPhiTheta[1] * 180 / M_PI,
2128-
mRPhiTheta[2] * 180 / M_PI, mAngle[1] * 180 / M_PI, mAngle[0] * 180 / M_PI, mAngle[2] * 180 / M_PI);
2127+
fps, mCfg.drawSlice, mCfg.drawClusters, mCfg.drawInitLinks, mCfg.drawLinks, mCfg.drawSeeds, mCfg.drawTracklets, mCfg.drawTracks, mCfg.drawGlobalTracks, mCfg.drawFinal, mFramesDone, mNDrawCalls, mXYZ[0], mXYZ[1], mXYZ[2], mRPhiTheta[0], mRPhiTheta[1] * 180 / CAMath::Pi(),
2128+
mRPhiTheta[2] * 180 / CAMath::Pi(), mAngle[1] * 180 / CAMath::Pi(), mAngle[0] * 180 / CAMath::Pi(), mAngle[2] * 180 / CAMath::Pi());
21292129
if (fpstime > 1.) {
21302130
if (mPrintInfoText & 2) {
21312131
GPUInfo("%s", info);

0 commit comments

Comments
 (0)