Implement Vit comments

Author: Marcellocosti

PWGHF/TableProducer/candidateCreator2Prong.cxx

@@ -916,7 +916,7 @@ struct HfCandidateCreator2ProngExpressions {
       if (matchCorrBkgs) {
         hf_mc_gen::fillMcMatchGen2Prong<true>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
       } else {
-        hf_mc_gen::fillMcMatchGen2Prong(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
+        hf_mc_gen::fillMcMatchGen2Prong<false>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
       }
     }
   }

PWGHF/TableProducer/candidateCreator3Prong.cxx

@@ -1205,7 +1205,7 @@ struct HfCandidateCreator3ProngExpressions {
       if (matchCorrBkgs) {
         hf_mc_gen::fillMcMatchGen3Prong<true>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground, mothersCorrBkgsPdgs.value);
       } else {
-        hf_mc_gen::fillMcMatchGen3Prong(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
+        hf_mc_gen::fillMcMatchGen3Prong<false>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen, rejectBackground);
       }
     }
   }

PWGHF/TableProducer/candidateCreatorMcGen.cxx

@@ -55,10 +55,10 @@ struct HfCandidateCreatorMcGen {
     for (const auto& mcCollision : mcCollisions) {
       const auto mcParticlesPerMcColl = mcParticles.sliceBy(mcParticlesPerMcCollision, mcCollision.globalIndex());
       if (fill2Prong) {
-        hf_mc_gen::fillMcMatchGen2Prong(mcParticles, mcParticlesPerMcColl, rowMcMatchGen2Prong, rejectBackground2Prong);
+        hf_mc_gen::fillMcMatchGen2Prong<false>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen2Prong, rejectBackground2Prong);
       }
       if (fill3Prong) {
-        hf_mc_gen::fillMcMatchGen3Prong(mcParticles, mcParticlesPerMcColl, rowMcMatchGen3Prong, rejectBackground3Prong);
+        hf_mc_gen::fillMcMatchGen3Prong<false>(mcParticles, mcParticlesPerMcColl, rowMcMatchGen3Prong, rejectBackground3Prong);
       }
     }
     if (fillBplus) {

PWGHF/Utils/utilsMcGen.h

@@ -36,7 +36,7 @@
 namespace hf_mc_gen
 {
 
-template <bool matchCorrBkgs = false, typename T, typename U, typename V>
+template <bool matchCorrBkgs, typename T, typename U, typename V>
 void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V& rowMcMatchGen, bool rejectBackground)
 {
   using namespace o2::constants::physics;
@@ -46,7 +46,7 @@ void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
   for (const auto& particle : mcParticlesPerMcColl) {
     int8_t flag = 0;
     int8_t origin = 0;
-    int8_t channel = 0; // Not used in 2-prong decays
+    int8_t channel = 0;
     int8_t sign = 0;
     std::vector<int> idxBhadMothers{};
     // Reject particles from background events
@@ -121,7 +121,7 @@ void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
   }
 }
 
-template <bool matchCorrBkgs = false, typename T, typename U, typename V>
+template <bool matchCorrBkgs, typename T, typename U, typename V>
 void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V& rowMcMatchGen, bool rejectBackground, std::vector<int> const& corrBkgMothersPdgs = {})
 {
   using namespace o2::constants::physics;

PWGHF/Utils/utilsMcMatching.h

@@ -163,37 +163,35 @@ inline std::unordered_map<DecayChannelMain, const std::vector<int>> getDecayChan
 }
 } // namespace hf_cand_3prong
 
-/// Perform the matching for a single resonant channel
-/// \tparam N size of the array of daughter PDG codes
-/// \param arrPdgResoChn array of daughter indices
-/// \param arrPdgDaugs array of PDG codes for the resonant decay
-/// \return true if the resonant channel is matched, false otherwise
+/// Compare an array of PDG codes with an expected array
+/// \tparam N size of the arrays to be compared
+/// \param arrPdgTested array of PDG codes to be tested
+/// \param arrPdgExpected array of the expected PDG codes
+/// \return true if the arrays are equal, false otherwise
 template <std::size_t N>
-inline bool checkDecayChannel(std::array<int, N> const& arrPdgResoChn, std::array<int, N> arrPdgDaugs)
+inline bool checkDecayChannel(std::array<int, N> const& arrPdgTested, std::array<int, N> arrPdgExpected)
 {
   for (std::size_t i = 0; i < N; i++) {
-    bool findDaug = false;
+    bool foundPdg = false;
     for (std::size_t j = 0; j < N; j++) {
-      if (std::abs(arrPdgResoChn[i]) == std::abs(arrPdgDaugs[j])) {
-        arrPdgDaugs[j] = -1; // Mark as found
-        findDaug = true;
+      if (std::abs(arrPdgTested[i]) == std::abs(arrPdgExpected[j])) {
+        arrPdgExpected[j] = -1; // Mark as found
+        foundPdg = true;
         break;
       }
     }
-    if (!findDaug) {
+    if (!foundPdg) {
       return false;
     }
   }
   return true;
 }
 
 /// Flag the resonant decays
-/// Function documentation:
-/// \tparam is3Prong bool to specify if the mother decays with a 3-prong decay
 /// \tparam N size of the array of daughter PDG codes
 /// \param motherPdg PDG code of the mother particle
-/// \param channel decay channel flag to be set
 /// \param arrDaughPdgs array of daughter PDG codes
+/// \return the flag for the matched resonant decay channel
 template <std::size_t N>
 inline int8_t flagResonantDecay(const int motherPdg, std::array<int, N> const& arrDaughPdgs)
 {
@@ -248,16 +246,17 @@ inline int8_t flagResonantDecay(const int motherPdg, std::array<int, N> const& a
 }
 
 /// Flip the sign of a specific PDG code in an array
-/// of PDG codes representing either a final or a resonant state
+/// of PDG codes associated to an antiparticle.
 /// \tparam N size of the array of PDG codes
 /// \param motherPdgCode PDG code of the mother particle
-/// \param partPdgCode PDG code of the target particle
+/// \param partPdgCode PDG code to be flipped
 /// \param arrFinalStatePdgs array of PDG codes to be modified
 template <std::size_t N>
 inline void changeFinalStatePdgSign(const int motherPdgCode, const int partPdgCode, std::array<int, N>& arrFinalStatePdgs)
 {
-  if (motherPdgCode >= 0)
+  if (motherPdgCode >= 0) {
     return;
+  }
   for (auto& part : arrFinalStatePdgs) { // o2-linter: disable=const-ref-in-for-loop (arrFinalStatePdgs entries are modified)
     if (part == partPdgCode) {
       part = -part;