Implement comments from Vit

Author: fchinu

PWGHF/Core/DecayChannels.h

@@ -176,20 +176,27 @@ enum DecayChannelResonant : int8_t {
 };
 /// @brief beauty candidates: beauty to J/ψ decay channels
 enum DecayChannelToJpsiMain : int8_t {
+  // B0
+  B0ToJpsiPiK, // J/ψ π- K+
+  // Bs0
+  BsToJpsiKK, // J/ψ K+ K-
+  // Λb0
+  LbToJpsiPK, // J/ψ p K-
+  // B+
   BplusToJpsiK = 1, // J/ψ K+
-  B0ToJpsiPiK,      // J/ψ π- K+
-  BsToJpsiKK,       // J/ψ K+ K-
-  BcToJPsiPi,       // J/ψ π+
-  LbToJpsipK,       // J/ψ p K-
+  // Bc+
+  BcToJpsiPi, // J/ψ π+
   //
-  LastChannelBeautyToJpsi
+  LastChannelToJpsiMain
 };
 /// @brief beauty candidates: beauty to J/ψ resonant decay channels
 enum DecayChannelToJpsiResonant : int8_t {
-  B0ToJpsiKStar0 = 1, // J/ψ K*0(892)
-  BsToJpsiPhi,        // J/ψ φ
+  // B0
+  B0ToJpsiKstar0 = 1, // J/ψ K*0(892)
+  // Bs0
+  BsToJpsiPhi, // J/ψ φ
   //
-  LastChannelBeautyToJpsiResonant
+  LastChannelToJpsiResonant
 };
 } // namespace hf_cand_beauty
 } // namespace o2::hf_decay

PWGHF/Core/HfHelper.h

@@ -1084,9 +1084,9 @@ class HfHelper
   {
     auto ptCandBs = candBs.pt();
     auto mCandBs = invMassBsToJpsiPhi(candBs);
-    std::array<float, 3> pVecKa0 = {candKa0.px(), candKa0.py(), candKa0.pz()};
-    std::array<float, 3> pVecKa1 = {candKa1.px(), candKa1.py(), candKa1.pz()};
-    auto mcandPhi = RecoDecay::m(std::array{pVecKa0, pVecKa1}, std::array{o2::constants::physics::MassKPlus, o2::constants::physics::MassKPlus});
+    std::array<float, 3> pVecKa0 = candKa0.pVector();
+    std::array<float, 3> pVecKa1 = candKa1.pVector();
+    auto mCandPhi = RecoDecay::m(std::array{pVecKa0, pVecKa1}, std::array{o2::constants::physics::MassKPlus, o2::constants::physics::MassKPlus});
     auto ptJpsi = RecoDecay::pt(candBs.pxProng0(), candBs.pyProng0());
     auto candJpsi = candBs.jPsi();
     float pseudoPropDecLen = candBs.decayLengthXY() * mCandBs / ptCandBs;
@@ -1113,7 +1113,7 @@ class HfHelper
     }
 
     // phi mass
-    if (std::abs(mcandPhi - o2::constants::physics::MassPhi) < cuts->get(binPt, "DeltaM phi")) {
+    if (std::abs(mCandPhi - o2::constants::physics::MassPhi) < cuts->get(binPt, "DeltaM phi")) {
       return false;
     }
 

PWGHF/D2H/DataModel/ReducedDataModel.h

@@ -681,7 +681,7 @@ namespace hf_cand_bplus_reduced
 {
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed2Prongs, "_0");    //! Prong0 index
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
-DECLARE_SOA_INDEX_COLUMN_FULL(Jpsi, jPsi, int, HfRedJpsis, "_0");          //! J/Psi index
+DECLARE_SOA_INDEX_COLUMN_FULL(Jpsi, jpsi, int, HfRedJpsis, "_0");          //! J/Psi index
 DECLARE_SOA_INDEX_COLUMN_FULL(BachKa, bachKa, int, HfRedBach0Bases, "_0"); //! J/Psi index
 DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float);             //! Bkg ML score of the D daughter
 DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float);       //! Prompt ML score of the D daughter
@@ -707,7 +707,7 @@ namespace hf_cand_bs_reduced
 {
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0");          //! Prong0 index
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1");       //! Prong1 index
-DECLARE_SOA_INDEX_COLUMN_FULL(Jpsi, jPsi, int, HfRedJpsis, "_0");                //! J/Psi index
+DECLARE_SOA_INDEX_COLUMN_FULL(Jpsi, jpsi, int, HfRedJpsis, "_0");                //! J/Psi index
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong0Phi, prong0Phi, int, HfRedBach0Bases, "_0"); //! J/Psi index
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong1Phi, prong1Phi, int, HfRedBach1Bases, "_0"); //! J/Psi index
 DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float);                   //! Bkg ML score of the D daughter

PWGHF/D2H/TableProducer/candidateCreatorBToJpsiReduced.cxx

@@ -67,8 +67,8 @@ struct HfCandidateCreatorBToJpsiReduced {
   double massBplus{0.}, massBs{0.};
   double bz{0.};
   o2::vertexing::DCAFitterN<2> df2; // fitter for B vertex (2-prong vertex fitter)
-  o2::vertexing::DCAFitterN<3> df3; // fitter for B vertex (2-prong vertex fitter)
-  o2::vertexing::DCAFitterN<4> df4; // fitter for B vertex (2-prong vertex fitter)
+  o2::vertexing::DCAFitterN<3> df3; // fitter for B vertex (3-prong vertex fitter)
+  o2::vertexing::DCAFitterN<4> df4; // fitter for B vertex (4-prong vertex fitter)
 
   using HfRedCollisionsWithExtras = soa::Join<aod::HfRedCollisions, aod::HfRedCollExtras>;
 
@@ -139,8 +139,8 @@ struct HfCandidateCreatorBToJpsiReduced {
                             Cands const& candsJpsiThisColl,
                             TTracks0 const& tracksLfDau0ThisCollision,
                             TTracks1 const& tracksLfDau1ThisCollision,
-                            const float& invMass2JpsiHadMin,
-                            const float& invMass2JpsiHadMax)
+                            const float invMass2JpsiHadMin,
+                            const float invMass2JpsiHadMax)
   {
     auto primaryVertex = getPrimaryVertex(collision);
     auto covMatrixPV = primaryVertex.getCov();

PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx

@@ -551,7 +551,7 @@ struct HfDataCreatorJpsiHadReduced {
         }
 
         // save information for Bs task
-        if (abs(flag) != o2::hf_decay::hf_cand_beauty::BsToJpsiKK) {
+        if (std::abs(flag) != o2::hf_decay::hf_cand_beauty::BsToJpsiKK) {
           continue;
         }