[PWGHF] Cleanup, optimisation, bug fixes using clang-tidy

PWGHF/Core/CentralityEstimation.h

@@ -18,6 +18,8 @@
 
 #include <Framework/Logger.h>
 
+#include <cstdint>
+
 namespace o2::hf_centrality
 {
 // centrality selection estimators
@@ -32,34 +34,34 @@ enum CentralityEstimator {
 };
 
 template <typename T>
-concept hasFT0ACent = requires(T collision) {
+concept HasFT0ACent = requires(T collision) {
   collision.centFT0A();
 };
 
 template <typename T>
-concept hasFT0CCent = requires(T collision) {
+concept HasFT0CCent = requires(T collision) {
   collision.centFT0C();
 };
 
 template <typename T>
-concept hasFT0MCent = requires(T collision) {
+concept HasFT0MCent = requires(T collision) {
   collision.centFT0M();
 };
 
 template <typename T>
-concept hasFV0ACent = requires(T collision) {
+concept HasFV0ACent = requires(T collision) {
   collision.centFV0A();
 };
 
 template <typename T>
-concept hasNTracksPVCent = requires(T collision) {
+concept HasNTracksPvCent = requires(T collision) {
   collision.centNTPV();
 };
 
 /// Evaluate centrality/multiplicity percentile using FT0A estimator
 /// \param candidate is candidate
 /// \return centrality/multiplicity percentile of the collision
-template <hasFT0ACent TCollision>
+template <HasFT0ACent TCollision>
 float getCentralityColl(const TCollision& collision)
 {
   return collision.centFT0A();
@@ -68,7 +70,7 @@ float getCentralityColl(const TCollision& collision)
 /// Evaluate centrality/multiplicity percentile using FT0C estimator
 /// \param candidate is candidate
 /// \return centrality/multiplicity percentile of the collision
-template <hasFT0CCent TCollision>
+template <HasFT0CCent TCollision>
 float getCentralityColl(const TCollision& collision)
 {
   return collision.centFT0C();
@@ -77,7 +79,7 @@ float getCentralityColl(const TCollision& collision)
 /// Evaluate centrality/multiplicity percentile using FT0M estimator
 /// \param candidate is candidate
 /// \return centrality/multiplicity percentile of the collision
-template <hasFT0MCent TCollision>
+template <HasFT0MCent TCollision>
 float getCentralityColl(const TCollision& collision)
 {
   return collision.centFT0M();
@@ -86,7 +88,7 @@ float getCentralityColl(const TCollision& collision)
 /// Evaluate centrality/multiplicity percentile using FV0A estimator
 /// \param candidate is candidate
 /// \return centrality/multiplicity percentile of the collision
-template <hasFV0ACent TCollision>
+template <HasFV0ACent TCollision>
 float getCentralityColl(const TCollision& collision)
 {
   return collision.centFV0A();
@@ -95,7 +97,7 @@ float getCentralityColl(const TCollision& collision)
 /// Evaluate centrality/multiplicity percentile using NTracksPV estimator
 /// \param candidate is candidate
 /// \return centrality/multiplicity percentile of the collision
-template <hasNTracksPVCent TCollision>
+template <HasNTracksPvCent TCollision>
 float getCentralityColl(const TCollision& collision)
 {
   return collision.centNTPV();
@@ -119,25 +121,25 @@ float getCentralityColl(const TCollision& collision, const int centEstimator)
 {
   switch (centEstimator) {
     case CentralityEstimator::FT0A:
-      if constexpr (hasFT0ACent<TCollision>) {
+      if constexpr (HasFT0ACent<TCollision>) {
         return collision.centFT0A();
       }
       LOG(fatal) << "Collision does not have centFT0A().";
       break;
     case CentralityEstimator::FT0C:
-      if constexpr (hasFT0CCent<TCollision>) {
+      if constexpr (HasFT0CCent<TCollision>) {
         return collision.centFT0C();
       }
       LOG(fatal) << "Collision does not have centFT0C().";
       break;
     case CentralityEstimator::FT0M:
-      if constexpr (hasFT0MCent<TCollision>) {
+      if constexpr (HasFT0MCent<TCollision>) {
         return collision.centFT0M();
       }
       LOG(fatal) << "Collision does not have centFT0M().";
       break;
     case CentralityEstimator::FV0A:
-      if constexpr (hasFV0ACent<TCollision>) {
+      if constexpr (HasFV0ACent<TCollision>) {
         return collision.centFV0A();
       }
       LOG(fatal) << "Collision does not have centFV0A().";

PWGHF/Core/HfHelper.h

@@ -290,9 +290,9 @@ class HfHelper
   auto cosPiKPhiRestFrame(const T& candidate, int option)
   {
     // Ported from AliAODRecoDecayHF3Prong::CosPiKPhiRFrame
-    std::array<float, 3> momPi;
-    std::array<float, 3> momK1;
-    std::array<float, 3> momK2;
+    std::array<float, 3> momPi{};
+    std::array<float, 3> momK1{};
+    std::array<float, 3> momK2{};
 
     if (option == 0) { // KKPi
       momPi = candidate.pVectorProng2();
@@ -304,12 +304,12 @@ class HfHelper
       momK2 = candidate.pVectorProng2();
     }
 
-    ROOT::Math::PxPyPzMVector vecPi(momPi[0], momPi[1], momPi[2], o2::constants::physics::MassPiPlus);
-    ROOT::Math::PxPyPzMVector vecK1(momK1[0], momK1[1], momK1[2], o2::constants::physics::MassKPlus);
-    ROOT::Math::PxPyPzMVector vecK2(momK2[0], momK2[1], momK2[2], o2::constants::physics::MassKPlus);
-    ROOT::Math::PxPyPzMVector vecPhi = vecK1 + vecK2;
+    ROOT::Math::PxPyPzMVector const vecPi(momPi[0], momPi[1], momPi[2], o2::constants::physics::MassPiPlus);
+    ROOT::Math::PxPyPzMVector const vecK1(momK1[0], momK1[1], momK1[2], o2::constants::physics::MassKPlus);
+    ROOT::Math::PxPyPzMVector const vecK2(momK2[0], momK2[1], momK2[2], o2::constants::physics::MassKPlus);
+    ROOT::Math::PxPyPzMVector const vecPhi = vecK1 + vecK2;
 
-    ROOT::Math::Boost boostToPhiRestFrame(vecPhi.BoostToCM());
+    ROOT::Math::Boost const boostToPhiRestFrame(vecPhi.BoostToCM());
     auto momPiPhiRestFrame = boostToPhiRestFrame(vecPi).Vect();
     auto momK1PhiRestFrame = boostToPhiRestFrame(vecK1).Vect();
 
@@ -522,8 +522,8 @@ class HfHelper
       phiPi = RecoDecay::phi(candidate.pxProng2(), candidate.pyProng2());
     }
 
-    double deltaEta = etaJpsi - etaPi;
-    double deltaPhi = RecoDecay::constrainAngle(phiJpsi - phiPi, -o2::constants::math::PI);
+    double const deltaEta = etaJpsi - etaPi;
+    double const deltaPhi = RecoDecay::constrainAngle(phiJpsi - phiPi, -o2::constants::math::PI);
 
     return RecoDecay::sqrtSumOfSquares(deltaEta, deltaPhi);
   }

PWGHF/Core/HfMlResponseBplusToD0Pi.h

@@ -21,6 +21,8 @@
 
 #include "Tools/ML/MlResponse.h"
 
+#include <CommonConstants/PhysicsConstants.h>
+
 #include <cstdint>
 #include <vector>
 
@@ -63,7 +65,7 @@
 // where OBJECT is named candidateD , FEATURE = GETTER and INDEX is the index of the vector
 #define CHECK_AND_FILL_VEC_D0_INDEX(FEATURE, GETTER1, GETTER2, INDEX) \
   case static_cast<uint8_t>(InputFeaturesBplusToD0Pi::FEATURE): {     \
-    if (pdgCode == o2::constants::physics::kD0) {                     \
+    if (pdgCode == o2::constants::physics::Pdg::kD0) {                \
       inputFeatures.emplace_back((candidateD0.GETTER1())[INDEX]);     \
     } else {                                                          \
       inputFeatures.emplace_back((candidateD0.GETTER2())[INDEX]);     \

PWGHF/Core/HfMlResponseBplusToJpsiKReduced.h

@@ -21,6 +21,8 @@
 
 #include "Tools/ML/MlResponse.h"
 
+#include <CommonConstants/PhysicsConstants.h>
+
 #include <cstdint>
 #include <vector>
 

PWGHF/Core/HfMlResponseBsToJpsiPhiReduced.h

@@ -21,6 +21,8 @@
 
 #include "Tools/ML/MlResponse.h"
 
+#include <CommonConstants/PhysicsConstants.h>
+
 #include <cstdint>
 #include <vector>