Generalize pdg switcher + suppress linter warnings

Author: Marcellocosti

PWGHF/TableProducer/candidateCreator2Prong.cxx

@@ -783,7 +783,7 @@ struct HfCandidateCreator2ProngExpressions {
         // D0(bar) → π+ K−, π+ K− π0, π+ π−, π+ π− π0, K+ K−
         for (const auto& [chn, finalState] : hf_cand_2prong::daughtersD0Main) {
           std::array<int, 2> finalStateParts2Prong = std::array{finalState[0], finalState[1]};
-          if (finalState.size() == 3) { // Partly Reco 2-prong decays
+          if (finalState.size() == 3) { // Partly Reco 3-prong decays, o2-linter: disable=magic-number
             if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
               indexRec = RecoDecay::getMatchedMCRec<false, false, true, true, true>(mcParticles, arrayDaughters, Pdg::kD0, finalStateParts2Prong, true, &sign, FinalStateDepth, &nKinkedTracks, &nInteractionsWithMaterial);
             } else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {
@@ -797,12 +797,12 @@ struct HfCandidateCreator2ProngExpressions {
             if (indexRec > -1) {
               auto motherParticle = mcParticles.rawIteratorAt(indexRec);
               std::array<int, 3> finalStateParts2ProngAll = std::array{finalState[0], finalState[1], finalState[2]};
-              convertPi0ToAntiPi0(motherParticle.pdgCode(), finalStateParts2ProngAll);
+              changeFinalStatePdgSign(motherParticle.pdgCode(), +kPi0, finalStateParts2ProngAll);
               if (!RecoDecay::isMatchedMCGen(mcParticles, motherParticle, Pdg::kD0, finalStateParts2ProngAll, true, &sign, FinalStateDepth)) {
                 indexRec = -1; // Reset indexRec if the generated decay does not match the reconstructed one does not match the reconstructed one
               }
             }
-          } else if (finalState.size() == 2) { // Fully Reco 2-prong decays
+          } else if (finalState.size() == 2) { // Fully Reco 2-prong decays, o2-linter: disable=magic-number
             if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
               indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(mcParticles, arrayDaughters, Pdg::kD0, finalStateParts2Prong, true, &sign, FinalStateDepth, &nKinkedTracks, &nInteractionsWithMaterial);
             } else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {

PWGHF/TableProducer/candidateCreator3Prong.cxx

@@ -959,7 +959,7 @@ struct HfCandidateCreator3ProngExpressions {
           auto finalStates = getDecayChannelMain(pdg);
           for (const auto& [chn, finalState] : finalStates) {
             std::array<int, 3> finalStateParts3Prong = std::array{finalState[0], finalState[1], finalState[2]};
-            if (finalState.size() > 3) { // Partly Reco 4-prong decays
+            if (finalState.size() > 3) { // Partly Reco decays with 4 or 5 final state particles, o2-linter: disable=magic-number 
               if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
                 indexRec = RecoDecay::getMatchedMCRec<false, false, true, true, true>(mcParticles, arrayDaughters, pdg, finalStateParts3Prong, true, &sign, depth, &nKinkedTracks, &nInteractionsWithMaterial);
               } else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {
@@ -972,21 +972,21 @@ struct HfCandidateCreator3ProngExpressions {
 
               if (indexRec > -1) {
                 auto motherParticle = mcParticles.rawIteratorAt(indexRec);
-                if (finalState.size() == 4) { // Check if the final state has 4 particles
+                if (finalState.size() == 4) { // Check if the final state has 4 particles, o2-linter: disable=magic-number
                   std::array<int, 4> finalStateParts3ProngAll = std::array{finalState[0], finalState[1], finalState[2], finalState[3]};
-                  convertPi0ToAntiPi0(motherParticle.pdgCode(), finalStateParts3ProngAll);
+                  changeFinalStatePdgSign(motherParticle.pdgCode(), +kPi0, finalStateParts3ProngAll);
                   if (!RecoDecay::isMatchedMCGen(mcParticles, motherParticle, pdg, finalStateParts3ProngAll, true, &sign, depth)) {
                     indexRec = -1; // Reset indexRec if the generated decay does not match the reconstructed one is not matched
                   }
-                } else if (finalState.size() == 5) { // Check if the final state has 5 particles
+                } else if (finalState.size() == 5) { // Check if the final state has 5 particles, o2-linter: disable=magic-number
                   std::array<int, 5> finalStateParts3ProngAll = std::array{finalState[0], finalState[1], finalState[2], finalState[3], finalState[4]};
-                  convertPi0ToAntiPi0(motherParticle.pdgCode(), finalStateParts3ProngAll);
+                  changeFinalStatePdgSign(motherParticle.pdgCode(), +kPi0, finalStateParts3ProngAll);
                   if (!RecoDecay::isMatchedMCGen(mcParticles, motherParticle, pdg, finalStateParts3ProngAll, true, &sign, depth)) {
                     indexRec = -1; // Reset indexRec if the generated decay does not match the reconstructed one is not matched
                   }
                 }
               }
-            } else if (finalState.size() == 3) { // Fully Reco 3-prong decays
+            } else if (finalState.size() == 3) { // Fully Reco 3-prong decays, o2-linter: disable=magic-number
               if (matchKinkedDecayTopology && matchInteractionsWithMaterial) {
                 indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(mcParticles, arrayDaughters, pdg, finalStateParts3Prong, true, &sign, depth, &nKinkedTracks, &nInteractionsWithMaterial);
               } else if (matchKinkedDecayTopology && !matchInteractionsWithMaterial) {
@@ -1023,7 +1023,7 @@ struct HfCandidateCreator3ProngExpressions {
                   auto daughI = mcParticles.rawIteratorAt(arrResoDaughIndex[iProng]);
                   arrPDGDaugh[iProng] = daughI.pdgCode();
                 }
-                channel = flagResonantDecay<true>(pdg, arrPDGDaugh);
+                channel = flagResonantDecay(pdg, arrPDGDaugh);
               }
               break; // Exit loop if a match is found
             }

PWGHF/Utils/utilsMcGen.h

@@ -60,11 +60,11 @@ void fillMcMatchGen2Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
       bool matched = false;
 
       for (const auto& [chn, finalState] : o2::hf_decay::hf_cand_2prong::daughtersD0Main) {
-        if (finalState.size() == 3) { // Partly Reco 3-prong decays
+        if (finalState.size() == 3) { // Partly Reco 3-prong decays, o2-linter: disable=magic-number
           std::array<int, 3> finalStateParts = std::array{finalState[0], finalState[1], finalState[2]};
-          o2::hf_decay::convertPi0ToAntiPi0(particle.pdgCode(), finalStateParts);
+          o2::hf_decay::changeFinalStatePdgSign(particle.pdgCode(), +kPi0, finalStateParts);
           matched = RecoDecay::isMatchedMCGen(mcParticles, particle, Pdg::kD0, finalStateParts, true, &sign, MaxDepth);
-        } else if (finalState.size() == 2) { // Fully Reco 2-prong decays
+        } else if (finalState.size() == 2) { // Fully Reco 2-prong decays, o2-linter: disable=magic-number
           std::array<int, 2> finalStateParts = std::array{finalState[0], finalState[1]};
           matched = RecoDecay::isMatchedMCGen(mcParticles, particle, Pdg::kD0, finalStateParts, true, &sign, MaxDepth);
         } else {
@@ -164,17 +164,17 @@ void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
 
         std::vector<int> arrAllDaughtersIndex;
         for (const auto& [chn, finalState] : finalStates) {
-          if (finalState.size() == 5) { // Partly Reco 3-prong decays from 5-prong decays
+          if (finalState.size() == 5) { // Partly Reco 3-prong decays from 5-prong decays, o2-linter: disable=magic-number
             std::array<int, 5> finalStateParts = std::array{finalState[0], finalState[1], finalState[2], finalState[3], finalState[4]};
-            o2::hf_decay::convertPi0ToAntiPi0(particle.pdgCode(), finalStateParts);
+            o2::hf_decay::changeFinalStatePdgSign(particle.pdgCode(), +kPi0, finalStateParts);
             RecoDecay::getDaughters<false>(particle, &arrAllDaughtersIndex, finalStateParts, maxDepth);
             matched = RecoDecay::isMatchedMCGen(mcParticles, particle, motherPdgCode, finalStateParts, true, &sign, -1);
-          } else if (finalState.size() == 4) { // Partly Reco 3-prong decays from 4-prong decays
-            std::array<int, 4> finalStateParts = std::array{finalState[0], finalState[1], finalState[2], finalState[3]};
-            o2::hf_decay::convertPi0ToAntiPi0(particle.pdgCode(), finalStateParts);
+          } else if (finalState.size() == 4) { // Partly Reco 3-prong decays from 4-prong decays, o2-linter: disable=magic-number
+            std::array<int, 4> finalStateParts = std::array{finalState[0], finalState[1], finalState[2], finalState[3]}; 
+            o2::hf_decay::changeFinalStatePdgSign(particle.pdgCode(), +kPi0, finalStateParts);
             RecoDecay::getDaughters<false>(particle, &arrAllDaughtersIndex, finalStateParts, maxDepth);
             matched = RecoDecay::isMatchedMCGen(mcParticles, particle, motherPdgCode, finalStateParts, true, &sign, -1);
-          } else if (finalState.size() == 3) { // Fully Reco 3-prong decays
+          } else if (finalState.size() == 3) { // Fully Reco 3-prong decays, o2-linter: disable=magic-number
             std::array<int, 3> finalStateParts = std::array{finalState[0], finalState[1], finalState[2]};
             RecoDecay::getDaughters<false>(particle, &arrAllDaughtersIndex, finalStateParts, maxDepth);
             matched = RecoDecay::isMatchedMCGen(mcParticles, particle, motherPdgCode, finalStateParts, true, &sign, maxDepth);
@@ -207,7 +207,7 @@ void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
                 auto daughI = mcParticles.rawIteratorAt(arrResoDaughIndex[iProng]);
                 arrPDGDaugh[iProng] = daughI.pdgCode();
               }
-              channel = o2::hf_decay::flagResonantDecay<true>(motherPdgCode, arrPDGDaugh);
+              channel = o2::hf_decay::flagResonantDecay(motherPdgCode, arrPDGDaugh);
             }
             break; // Exit loop if a match is found
           }
@@ -240,7 +240,7 @@ void fillMcMatchGen3Prong(T const& mcParticles, U const& mcParticlesPerMcColl, V
         }
         if (flag != 0) {
           RecoDecay::getDaughters(particle, &arrDaughIndex, std::array{0}, 1);
-          if (arrDaughIndex.size() == 2) {
+          if (arrDaughIndex.size() == NDaughtersResonant) {
             for (auto jProng = 0u; jProng < arrDaughIndex.size(); ++jProng) {
               auto daughJ = mcParticles.rawIteratorAt(arrDaughIndex[jProng]);
               arrPDGDaugh[jProng] = std::abs(daughJ.pdgCode());

PWGHF/Utils/utilsMcMatching.h

@@ -194,8 +194,8 @@ inline bool checkDecayChannel(std::array<int, N> const& arrPdgResoChn, std::arra
 /// \param motherPdg PDG code of the mother particle
 /// \param channel decay channel flag to be set
 /// \param arrDaughPdgs array of daughter PDG codes
-template <bool is3Prong = false, std::size_t N>
-inline int8_t flagResonantDecay(int motherPdg, std::array<int, N> const& arrDaughPdgs)
+template <std::size_t N>
+inline int8_t flagResonantDecay(const int motherPdg, std::array<int, N> const& arrDaughPdgs)
 {
   switch (motherPdg) {
     case o2::constants::physics::Pdg::kD0:
@@ -242,24 +242,25 @@ inline int8_t flagResonantDecay(int motherPdg, std::array<int, N> const& arrDaug
       break;
     default:
       LOG(fatal) << "Unknown PDG code for 3-prong final states: " << motherPdg;
-      return {};
+      return -1;
   }
   return 0;
 }
 
-/// Convert Pi0 to AntiPi0 in the array of PDG codes for antiparticles since
-/// the Pi0s stemming from antiparticle decays keep the pdg code 111.
+/// Flip the sign of a specific PDG code in an array 
+/// of PDG codes representing either a final or a resonant state
 /// \tparam N size of the array of PDG codes
-/// \param partPdgCode PDG code of the particle
-/// \param arrPdgIndexes array of PDG codes to be modified
+/// \param motherPdgCode PDG code of the mother particle
+/// \param partPdgCode PDG code of the target particle
+/// \param arrFinalStatePdgs array of PDG codes to be modified
 template <std::size_t N>
-inline void convertPi0ToAntiPi0(const int partPdgCode, std::array<int, N>& arrPdgIndexes)
+inline void changeFinalStatePdgSign(const int motherPdgCode, const int partPdgCode, std::array<int, N>& arrFinalStatePdgs)
 {
-  if (partPdgCode < 0) {
-    for (auto& part : arrPdgIndexes) { // o2-linter: disable=const-ref-in-for-loop (int elements)
-      if (part == kPi0) {
-        part = -part; // The Pi0 pdg code does not change between particle and antiparticle
-      }
+  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;
     }
   }
 }