Skip to content

Commit 12e780f

Browse files
committed
use std::hypot for vector norm calculation
1 parent 904d26c commit 12e780f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

PWGHF/TableProducer/treeCreatorLcToPKPi.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -875,11 +875,11 @@ struct HfTreeCreatorLcToPKPi {
875875
const float chi2Topo = candidate.kfChi2Topo();
876876
const float decayLength = candidate.kfDecayLength();
877877
const float dl = candidate.kfDecayLengthError();
878-
const float pt = std::sqrt(candidate.kfPx() * candidate.kfPx() + candidate.kfPy() * candidate.kfPy());
878+
const float pt = std::hypot(candidate.kfPx(), candidate.kfPy());
879879
const float deltaPt = std::sqrt(candidate.kfPx() * candidate.kfPx() * candidate.kfErrorPx() * candidate.kfErrorPx() +
880880
candidate.kfPy() * candidate.kfPy() * candidate.kfErrorPy() * candidate.kfErrorPy()) /
881881
pt;
882-
const float p = std::sqrt(pt * pt + candidate.kfPz() * candidate.kfPz());
882+
const float p = std::hypot(pt, candidate.kfPz());
883883
const float deltaP = std::sqrt(pt * pt * deltaPt * deltaPt +
884884
candidate.kfPz() * candidate.kfPz() * candidate.kfErrorPz() * candidate.kfErrorPz()) /
885885
p;

Tools/KFparticle/KFUtilities.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ float ldlFromKF(KFParticle kfpParticle, KFParticle PV)
298298
const float dxParticle = PV.GetX() - kfpParticle.GetX();
299299
const float dyParticle = PV.GetY() - kfpParticle.GetY();
300300
const float dzParticle = PV.GetZ() - kfpParticle.GetZ();
301-
float lParticle = std::sqrt(dxParticle * dxParticle + dyParticle * dyParticle + dzParticle * dzParticle);
301+
float lParticle = std::hypot(dxParticle, dyParticle, dzParticle);
302302
float dlParticle = (PV.GetCovariance(0) + kfpParticle.GetCovariance(0)) * dxParticle * dxParticle + (PV.GetCovariance(2) + kfpParticle.GetCovariance(2)) * dyParticle * dyParticle + (PV.GetCovariance(5) + kfpParticle.GetCovariance(5)) * dzParticle * dzParticle + 2 * ((PV.GetCovariance(1) + kfpParticle.GetCovariance(1)) * dxParticle * dyParticle + (PV.GetCovariance(3) + kfpParticle.GetCovariance(3)) * dxParticle * dzParticle + (PV.GetCovariance(4) + kfpParticle.GetCovariance(4)) * dyParticle * dzParticle);
303303
if (std::fabs(lParticle) < ArbitrarySmallNumber)
304304
lParticle = ArbitrarySmallNumber;
@@ -316,7 +316,7 @@ float ldlXYFromKF(KFParticle kfpParticle, KFParticle PV)
316316
{
317317
const float dxParticle = PV.GetX() - kfpParticle.GetX();
318318
const float dyParticle = PV.GetY() - kfpParticle.GetY();
319-
float lParticle = std::sqrt(dxParticle * dxParticle + dyParticle * dyParticle);
319+
float lParticle = std::hypot(dxParticle, dyParticle);
320320
float dlParticle = (PV.GetCovariance(0) + kfpParticle.GetCovariance(0)) * dxParticle * dxParticle + (PV.GetCovariance(2) + kfpParticle.GetCovariance(2)) * dyParticle * dyParticle + 2 * ((PV.GetCovariance(1) + kfpParticle.GetCovariance(1)) * dxParticle * dyParticle);
321321
if (std::fabs(lParticle) < ArbitrarySmallNumber)
322322
lParticle = ArbitrarySmallNumber;
@@ -366,7 +366,7 @@ float kfCalculateDistanceBetweenParticles(KFParticle track1, KFParticle track2)
366366
const float dx = params1[0] - params2[0];
367367
const float dy = params1[1] - params2[1];
368368
const float dz = params1[2] - params2[2];
369-
return std::sqrt(dx * dx + dy * dy + dz * dz);
369+
return std::hypot(dx, dy, dz);
370370
}
371371

372372
/// @brief squared distance between two tracks normalised by its uncertainty evaluated in matrix form

0 commit comments

Comments
 (0)