Let CTAD deduce types

Author: fchinu

PWGHF/Core/HfHelper.h

@@ -180,10 +180,10 @@ struct HfHelper {
     if (useJpsiPdgMass) {
       return RecoDecay::m(std::array{RecoDecay::pVec(pVecMuPos, pVecMuNeg), pVecKa},
                           std::array{o2::constants::physics::MassJPsi, o2::constants::physics::MassKPlus});
-    } else {
-      return RecoDecay::m(std::array{pVecMuPos, pVecMuNeg, pVecKa},
-                          std::array{o2::constants::physics::MassMuon, o2::constants::physics::MassMuon, o2::constants::physics::MassKPlus});
     }
+    // Do not use PDG mass for J/psi
+    return RecoDecay::m(std::array{pVecMuPos, pVecMuNeg, pVecKa},
+                        std::array{o2::constants::physics::MassMuon, o2::constants::physics::MassMuon, o2::constants::physics::MassKPlus});
   }
 
   template <typename T>
@@ -708,10 +708,10 @@ struct HfHelper {
     } else if (!useJpsiPdgMass && usePhiPdgMass) {
       return RecoDecay::m(std::array{pVecMuPos, pVecMuNeg, RecoDecay::pVec(pVecKaPos, pVecKaNeg)},
                           std::array{o2::constants::physics::MassMuon, o2::constants::physics::MassMuon, o2::constants::physics::MassPhi});
-    } else {
-      return RecoDecay::m(std::array{pVecMuPos, pVecMuNeg, pVecKaPos, pVecKaNeg},
-                          std::array{o2::constants::physics::MassMuon, o2::constants::physics::MassMuon, o2::constants::physics::MassKPlus, o2::constants::physics::MassKPlus});
     }
+    // Do not use PDG mass for either J/psi or phi
+    return RecoDecay::m(std::array{pVecMuPos, pVecMuNeg, pVecKaPos, pVecKaNeg},
+                        std::array{o2::constants::physics::MassMuon, o2::constants::physics::MassMuon, o2::constants::physics::MassKPlus, o2::constants::physics::MassKPlus});
   }
 
   template <typename T>
@@ -937,9 +937,9 @@ struct HfHelper {
   {
     auto ptCandBp = candBp.pt();
     auto mCandBp = invMassBplusToJpsiK(candBp, useJpsiPdgMass);
-    std::array<float, 3> const pVecMu0 = {candBp.pxProng0(), candBp.pyProng0(), candBp.pzProng0()};
-    std::array<float, 3> const pVecMu1 = {candBp.pxProng1(), candBp.pyProng1(), candBp.pzProng1()};
-    std::array<float, 3> const pVecKa = {candBp.pxProng2(), candBp.pyProng2(), candBp.pzProng2()};
+    std::array const pVecMu0{candBp.pxProng0(), candBp.pyProng0(), candBp.pzProng0()};
+    std::array const pVecMu1{candBp.pxProng1(), candBp.pyProng1(), candBp.pzProng1()};
+    std::array const pVecKa{candBp.pxProng2(), candBp.pyProng2(), candBp.pzProng2()};
     auto ptJpsi = RecoDecay::pt(pVecMu0, pVecMu1);
     auto ptKa = RecoDecay::pt(pVecKa);
     auto candJpsi = candBp.jpsi();
@@ -1127,10 +1127,10 @@ struct HfHelper {
   {
     auto ptCandBs = candBs.pt();
     auto mCandBs = invMassBsToJpsiPhi(candBs, useJpsiPdgMass, usePhiPdgMass);
-    std::array<float, 3> const pVecMu0 = {candBs.pxProng0(), candBs.pyProng0(), candBs.pzProng0()};
-    std::array<float, 3> const pVecMu1 = {candBs.pxProng1(), candBs.pyProng1(), candBs.pzProng1()};
-    std::array<float, 3> const pVecKa0 = {candBs.pxProng2(), candBs.pyProng2(), candBs.pzProng2()};
-    std::array<float, 3> const pVecKa1 = {candBs.pxProng3(), candBs.pyProng3(), candBs.pzProng3()};
+    std::array const pVecMu0{candBs.pxProng0(), candBs.pyProng0(), candBs.pzProng0()};
+    std::array const pVecMu1{candBs.pxProng1(), candBs.pyProng1(), candBs.pzProng1()};
+    std::array const pVecKa0{candBs.pxProng2(), candBs.pyProng2(), candBs.pzProng2()};
+    std::array const pVecKa1{candBs.pxProng3(), candBs.pyProng3(), candBs.pzProng3()};
     auto mCandPhi = RecoDecay::m(std::array{pVecKa0, pVecKa1}, std::array{o2::constants::physics::MassKPlus, o2::constants::physics::MassKPlus});
     auto ptJpsi = RecoDecay::pt(pVecMu0, pVecMu1);
     auto ptKa0 = RecoDecay::pt(pVecKa0);

PWGHF/D2H/Tasks/taskBplusToJpsiKReduced.cxx

@@ -343,8 +343,8 @@ struct HfTaskBplusToJpsiKReduced {
     auto invMassBplus = HfHelper::invMassBplusToJpsiK(candidate, useJpsiPdgMass);
     auto candJpsi = candidate.template jpsi_as<aod::HfRedJpsis>();
     auto candKa = candidate.template bachKa_as<aod::HfRedBach0Tracks>();
-    std::array<float, 3> const pVecMu0 = {candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()};
-    std::array<float, 3> const pVecMu1 = {candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()};
+    std::array const pVecMu0{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()};
+    std::array const pVecMu1{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()};
     auto ptJpsi = RecoDecay::pt(pVecMu0, pVecMu1);
     auto invMassJpsi = RecoDecay::m(std::array{pVecMu0, pVecMu1}, std::array{o2::constants::physics::MassMuonPlus, o2::constants::physics::MassMuonMinus});
     uint8_t statusBplus = 0;

PWGHF/D2H/Tasks/taskBsToJpsiPhiReduced.cxx

@@ -374,10 +374,10 @@ struct HfTaskBsToJpsiPhiReduced {
     auto candJpsi = candidate.template jpsi_as<aod::HfRedJpsis>();
     auto candKa0 = candidate.template prong0Phi_as<aod::HfRedBach0Tracks>();
     auto candKa1 = candidate.template prong1Phi_as<aod::HfRedBach1Tracks>();
-    std::array<float, 3> const pVecMu0 = {candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()};
-    std::array<float, 3> const pVecMu1 = {candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()};
-    std::array<float, 3> const pVecKa0 = {candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()};
-    std::array<float, 3> const pVecKa1 = {candidate.pxProng3(), candidate.pyProng3(), candidate.pzProng3()};
+    std::array const pVecMu0{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()};
+    std::array const pVecMu1{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()};
+    std::array const pVecKa0{candidate.pxProng2(), candidate.pyProng2(), candidate.pzProng2()};
+    std::array const pVecKa1{candidate.pxProng3(), candidate.pyProng3(), candidate.pzProng3()};
     auto ptJpsi = RecoDecay::pt(pVecMu0, pVecMu1);
     auto ptPhi = RecoDecay::pt(pVecKa0, pVecKa1);
     auto invMassJpsi = RecoDecay::m(std::array{pVecMu0, pVecMu1}, std::array{o2::constants::physics::MassMuonPlus, o2::constants::physics::MassMuonMinus});