address clang-tidy issues in Tools/KFUtilities.h

Author: lubynets

Tools/KFparticle/KFUtilities.h

@@ -70,24 +70,20 @@ KFPTrack createKFPTrack(const o2::track::TrackParametrizationWithError<float>& t
                         int16_t tpcNClsFound,
                         float tpcChi2NCl)
 {
-  std::array<float, 3> trkpos_par;
-  std::array<float, 3> trkmom_par;
-  std::array<float, 21> trk_cov;
+  std::array<float, 3> trkpos_par{};
+  std::array<float, 3> trkmom_par{};
+  std::array<float, 21> trk_cov{};
   trackparCov.getXYZGlo(trkpos_par);
   trackparCov.getPxPyPzGlo(trkmom_par);
   trackparCov.getCovXYZPxPyPzGlo(trk_cov);
-  float trkpar_KF[6] = {trkpos_par[0], trkpos_par[1], trkpos_par[2],
-                        trkmom_par[0], trkmom_par[1], trkmom_par[2]};
-  float trkcov_KF[21];
-  for (int i = 0; i < 21; i++) {
-    trkcov_KF[i] = trk_cov[i];
-  }
+  const float trkpar_KF[6] = {trkpos_par[0], trkpos_par[1], trkpos_par[2],
+                              trkmom_par[0], trkmom_par[1], trkmom_par[2]};
   KFPTrack kfpTrack;
   kfpTrack.SetParameters(trkpar_KF);
-  kfpTrack.SetCovarianceMatrix(trkcov_KF);
+  kfpTrack.SetCovarianceMatrix(trk_cov.data());
   kfpTrack.SetCharge(trackSign);
   kfpTrack.SetNDF(tpcNClsFound - 5);
-  kfpTrack.SetChi2(tpcNClsFound * tpcChi2NCl);
+  kfpTrack.SetChi2(static_cast<float>(tpcNClsFound) * tpcChi2NCl);
   return kfpTrack;
 }
 
@@ -135,15 +131,15 @@ KFParticle createKFParticleFromTrackParCov(const o2::track::TrackParametrization
     xyzpxpypz[i + 3] = pxpypz[i];
   }
 
-  std::array<float, 21> cv;
+  std::array<float, 21> cv{};
   try {
     trackparCov.getCovXYZPxPyPzGlo(cv);
   } catch (std::runtime_error& e) {
     LOG(debug) << "Failed to get cov matrix from TrackParCov" << e.what();
   }
 
   KFParticle kfPart;
-  float Mini, SigmaMini, M, SigmaM;
+  float Mini{}, SigmaMini{}, M{}, SigmaM{};
   kfPart.GetMass(Mini, SigmaMini);
   LOG(debug) << "Daughter KFParticle mass before creation: " << Mini << " +- " << SigmaMini;
 
@@ -165,8 +161,8 @@ KFParticle createKFParticleFromTrackParCov(const o2::track::TrackParametrization
 /// @return o2::track::TrackParametrizationWithError track
 o2::track::TrackParCov getTrackParCovFromKFP(const KFParticle& kfParticle, const o2::track::PID pid, const int sign)
 {
-  std::array<float, 3> xyz, pxpypz;
-  std::array<float, 21> cv;
+  std::array<float, 3> xyz{}, pxpypz{};
+  std::array<float, 21> cv{};
 
   // get parameters from kfParticle
   xyz[0] = kfParticle.GetX();
@@ -192,7 +188,7 @@ o2::track::TrackParCov getTrackParCovFromKFP(const KFParticle& kfParticle, const
 /// @return cpa
 float cpaFromKF(KFParticle kfp, KFParticle PV)
 {
-  float xVtxP, yVtxP, zVtxP, xVtxS, yVtxS, zVtxS, px, py, pz = 0.;
+  float xVtxP{}, yVtxP{}, zVtxP{}, xVtxS{}, yVtxS{}, zVtxS{}, px{}, py{}, pz{};
 
   xVtxP = PV.GetX();
   yVtxP = PV.GetY();
@@ -206,7 +202,7 @@ float cpaFromKF(KFParticle kfp, KFParticle PV)
   py = kfp.GetPy();
   pz = kfp.GetPz();
 
-  float cpa = RecoDecay::cpa(std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}, std::array{px, py, pz});
+  const float cpa = static_cast<float>(RecoDecay::cpa(std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}, std::array{px, py, pz}));
   return cpa;
 }
 
@@ -216,7 +212,7 @@ float cpaFromKF(KFParticle kfp, KFParticle PV)
 /// @return cpa in xy
 float cpaXYFromKF(KFParticle kfp, KFParticle PV)
 {
-  float xVtxP, yVtxP, xVtxS, yVtxS, px, py = 0.;
+  float xVtxP{}, yVtxP{}, xVtxS{}, yVtxS{}, px{}, py{};
 
   xVtxP = PV.GetX();
   yVtxP = PV.GetY();
@@ -227,7 +223,7 @@ float cpaXYFromKF(KFParticle kfp, KFParticle PV)
   px = kfp.GetPx();
   py = kfp.GetPy();
 
-  float cpaXY = RecoDecay::cpaXY(std::array{xVtxP, yVtxP}, std::array{xVtxS, yVtxS}, std::array{px, py});
+  const float cpaXY = static_cast<float>(RecoDecay::cpaXY(std::array{xVtxP, yVtxP}, std::array{xVtxS, yVtxS}, std::array{px, py}));
   return cpaXY;
 }
 
@@ -240,9 +236,9 @@ float cpaXYFromKF(KFParticle kfp, KFParticle PV)
 /// @param kfpprong0 KFParticle Prong 0
 /// @param kfpprong1 KFParticele Prong 1
 /// @return cos theta star
-float cosThetaStarFromKF(int ip, int pdgvtx, int pdgprong0, int pdgprong1, KFParticle kfpprong0, KFParticle kfpprong1)
+float cosThetaStarFromKF(int iProng, int pdgvtx, int pdgprong0, int pdgprong1, KFParticle kfpprong0, KFParticle kfpprong1)
 {
-  float px0, py0, pz0, px1, py1, pz1 = 0.;
+  float px0{}, py0{}, pz0{}, px1{}, py1{}, pz1{};
 
   px0 = kfpprong0.GetPx();
   py0 = kfpprong0.GetPy();
@@ -252,12 +248,11 @@ float cosThetaStarFromKF(int ip, int pdgvtx, int pdgprong0, int pdgprong1, KFPar
   py1 = kfpprong1.GetPy();
   pz1 = kfpprong1.GetPz();
   std::array<double, 2> m = {0., 0.};
-  m[0] = TDatabasePDG::Instance()->GetParticle(pdgprong0)->Mass();     // FIXME: Get from the PDG service of the common header
-  m[1] = TDatabasePDG::Instance()->GetParticle(pdgprong1)->Mass();     // FIXME: Get from the PDG service of the common header
-  double mTot = TDatabasePDG::Instance()->GetParticle(pdgvtx)->Mass(); // FIXME: Get from the PDG service of the common header
-  int iProng = ip;
+  m[0] = TDatabasePDG::Instance()->GetParticle(pdgprong0)->Mass();           // FIXME: Get from the PDG service of the common header
+  m[1] = TDatabasePDG::Instance()->GetParticle(pdgprong1)->Mass();           // FIXME: Get from the PDG service of the common header
+  const double mTot = TDatabasePDG::Instance()->GetParticle(pdgvtx)->Mass(); // FIXME: Get from the PDG service of the common header
 
-  float cosThetastar = RecoDecay::cosThetaStar(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m, mTot, iProng);
+  const float cosThetastar = static_cast<float>(RecoDecay::cosThetaStar(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m, mTot, iProng));
   return cosThetastar;
 }
 
@@ -269,7 +264,7 @@ float cosThetaStarFromKF(int ip, int pdgvtx, int pdgprong0, int pdgprong1, KFPar
 /// @return impact parameter
 float impParXYFromKF(KFParticle kfpParticle, KFParticle Vertex)
 {
-  float xVtxP, yVtxP, zVtxP, xVtxS, yVtxS, zVtxS, px, py, pz = 0.;
+  float xVtxP{}, yVtxP{}, zVtxP{}, xVtxS{}, yVtxS{}, zVtxS{}, px{}, py{}, pz{};
 
   xVtxP = Vertex.GetX();
   yVtxP = Vertex.GetY();
@@ -283,7 +278,7 @@ float impParXYFromKF(KFParticle kfpParticle, KFParticle Vertex)
   py = kfpParticle.GetPy();
   pz = kfpParticle.GetPz();
 
-  float impParXY = RecoDecay::impParXY(std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}, std::array{px, py, pz});
+  const float impParXY = static_cast<float>(RecoDecay::impParXY(std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}, std::array{px, py, pz}));
   return impParXY;
 }
 
@@ -293,14 +288,14 @@ float impParXYFromKF(KFParticle kfpParticle, KFParticle Vertex)
 /// @return l/delta l
 float ldlFromKF(KFParticle kfpParticle, KFParticle PV)
 {
-  float dx_particle = PV.GetX() - kfpParticle.GetX();
-  float dy_particle = PV.GetY() - kfpParticle.GetY();
-  float dz_particle = PV.GetZ() - kfpParticle.GetZ();
-  float l_particle = sqrt(dx_particle * dx_particle + dy_particle * dy_particle + dz_particle * dz_particle);
+  const float dx_particle = PV.GetX() - kfpParticle.GetX();
+  const float dy_particle = PV.GetY() - kfpParticle.GetY();
+  const float dz_particle = PV.GetZ() - kfpParticle.GetZ();
+  float l_particle = std::sqrt(dx_particle * dx_particle + dy_particle * dy_particle + dz_particle * dz_particle);
   float dl_particle = (PV.GetCovariance(0) + kfpParticle.GetCovariance(0)) * dx_particle * dx_particle + (PV.GetCovariance(2) + kfpParticle.GetCovariance(2)) * dy_particle * dy_particle + (PV.GetCovariance(5) + kfpParticle.GetCovariance(5)) * dz_particle * dz_particle + 2 * ((PV.GetCovariance(1) + kfpParticle.GetCovariance(1)) * dx_particle * dy_particle + (PV.GetCovariance(3) + kfpParticle.GetCovariance(3)) * dx_particle * dz_particle + (PV.GetCovariance(4) + kfpParticle.GetCovariance(4)) * dy_particle * dz_particle);
-  if (fabs(l_particle) < 1.e-8f)
+  if (std::fabs(l_particle) < 1.e-8f)
     l_particle = 1.e-8f;
-  dl_particle = dl_particle < 0. ? 1.e8f : sqrt(dl_particle) / l_particle;
+  dl_particle = dl_particle < 0.f ? 1.e8f : std::sqrt(dl_particle) / l_particle;
   if (dl_particle == 0.)
     return 9999.;
   return l_particle / dl_particle;
@@ -312,13 +307,13 @@ float ldlFromKF(KFParticle kfpParticle, KFParticle PV)
 /// @return l/delta l in xy plane
 float ldlXYFromKF(KFParticle kfpParticle, KFParticle PV)
 {
-  float dx_particle = PV.GetX() - kfpParticle.GetX();
-  float dy_particle = PV.GetY() - kfpParticle.GetY();
-  float l_particle = sqrt(dx_particle * dx_particle + dy_particle * dy_particle);
+  const float dx_particle = PV.GetX() - kfpParticle.GetX();
+  const float dy_particle = PV.GetY() - kfpParticle.GetY();
+  float l_particle = std::sqrt(dx_particle * dx_particle + dy_particle * dy_particle);
   float dl_particle = (PV.GetCovariance(0) + kfpParticle.GetCovariance(0)) * dx_particle * dx_particle + (PV.GetCovariance(2) + kfpParticle.GetCovariance(2)) * dy_particle * dy_particle + 2 * ((PV.GetCovariance(1) + kfpParticle.GetCovariance(1)) * dx_particle * dy_particle);
-  if (fabs(l_particle) < 1.e-8f)
+  if (std::fabs(l_particle) < 1.e-8f)
     l_particle = 1.e-8f;
-  dl_particle = dl_particle < 0. ? 1.e8f : sqrt(dl_particle) / l_particle;
+  dl_particle = dl_particle < 0.f ? 1.e8f : std::sqrt(dl_particle) / l_particle;
   if (dl_particle == 0.)
     return 9999.;
   return l_particle / dl_particle;
@@ -374,11 +369,11 @@ float kfCalculateDistanceBetweenParticles(KFParticle track1, KFParticle track2)
 float kfCalculateChi2geoBetweenParticles(KFParticle track1, KFParticle track2)
 {
   KFParticle kfPair;
-  const KFParticle* kfDaughters[3] = {&track1, &track2};
+  const KFParticle* kfDaughters[2] = {&track1, &track2};
   kfPair.SetConstructMethod(2);
   kfPair.Construct(kfDaughters, 2);
 
-  return kfPair.Chi2() / kfPair.NDF();
+  return kfPair.Chi2() / static_cast<float>(kfPair.NDF());
 }
 
 /// @brief signed distance between primary and secondary vertex and its uncertainty, cm
@@ -387,7 +382,7 @@ float kfCalculateChi2geoBetweenParticles(KFParticle track1, KFParticle track2)
 /// @return pair of l and delta l
 std::pair<float, float> kfCalculateLdL(KFParticle candidate, const KFParticle& vtx)
 {
-  float l, dl;
+  float l{}, dl{};
   candidate.SetProductionVertex(vtx);
   candidate.KFParticleBase::GetDecayLength(l, dl);
 
@@ -400,7 +395,7 @@ std::pair<float, float> kfCalculateLdL(KFParticle candidate, const KFParticle& v
 /// @return pair of impact parameter and its error
 std::pair<float, float> kfCalculateImpactParameterZ(const KFParticle& candidate, const KFParticle& vtx)
 {
-  float distanceToVertexXY, errDistanceToVertexXY;
+  float distanceToVertexXY{}, errDistanceToVertexXY{};
   candidate.GetDistanceFromVertexXY(vtx, distanceToVertexXY, errDistanceToVertexXY);
   const float distanceToVertex = candidate.GetDistanceFromVertex(vtx);
   const float chi2ToVertex = candidate.GetDeviationFromVertex(vtx);