From 582f15626a769e8b49bdbfdf26d5e66400cb238b Mon Sep 17 00:00:00 2001
From: nzardosh <nima.zardoshti@cern.ch>
Date: Sat, 22 Nov 2025 17:12:48 +0100
Subject: [PATCH] fixing the correct matching function

---
 PWGJE/Core/JetHFUtilities.h | 78 ++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h
index 7dc84055cd6..1d9bf0841a5 100644
--- a/PWGJE/Core/JetHFUtilities.h
+++ b/PWGJE/Core/JetHFUtilities.h
@@ -601,20 +601,6 @@ bool isHFDaughterTrack(T& track, U& candidate)
   }
 }
 
-/**
- * returns the index of the JMcParticle matched to the HF candidate
- *
- * @param candidate hf candidate that is being checked
- * @param tracks track table
- * @param particles particle table
- */
-template <typename T, typename U, typename V>
-auto matchedHFParticleId(const T& candidate, const U& /*tracks*/, const V& /*particles*/)
-{
-  const auto candidateDaughterParticle = candidate.template prong1_as<U>().template mcParticle_as<V>();
-  return candidateDaughterParticle.template mothers_first_as<V>().globalIndex(); // can we get the Id directly?
-}
-
 /**
  * returns the JMcParticle matched to the HF candidate
  *
@@ -626,35 +612,63 @@ template <typename T, typename U, typename V>
 auto matchedHFParticle(const T& candidate, const U& /*tracks*/, const V& /*particles*/)
 {
 
-  const typename V::iterator candidateDaughterParticle;
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK) {
-    candidateDaughterParticle = candidate.template prong1_as<U>().template mcParticle_as<V>();
+  typename V::iterator candidateDaughterParticle;
+  if constexpr (isD0Candidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK) {
+      candidateDaughterParticle = candidate.template prong0_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi) {
-    candidateDaughterParticle = candidate.template prong1_as<U>().template mcParticle_as<V>();
+  if constexpr (isDplusCandidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::DplusToPiKPi) {
+      candidateDaughterParticle = candidate.template prong0_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::DsToPiKK) {
-    candidateDaughterParticle = candidate.template prong1_as<U>().template mcParticle_as<V>();
+  if constexpr (isDsCandidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::DsToPiKK) {
+      candidateDaughterParticle = candidate.template prong0_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_dstar::DecayChannelMain::DstarToPiKPi) {
-    candidateDaughterParticle = candidate.template prong3_as<U>().template mcParticle_as<V>();
+  if constexpr (isDstarCandidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_dstar::DecayChannelMain::DstarToPiKPi) {
+      candidateDaughterParticle = candidate.template prong2_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) {
-    candidateDaughterParticle = candidate.template prong1_as<U>().template mcParticle_as<V>();
+  if constexpr (isLcCandidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) {
+      candidateDaughterParticle = candidate.template prong0_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_beauty::DecayChannelMain::B0ToDminusPi) {
-    candidateDaughterParticle = candidate.template prong4_as<U>().template mcParticle_as<V>();
+  if constexpr (isB0Candidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_beauty::DecayChannelMain::B0ToDminusPi) {
+      candidateDaughterParticle = candidate.template prong3_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_beauty::DecayChannelMain::BplusToD0Pi) {
-    candidateDaughterParticle = candidate.template prong3_as<U>().template mcParticle_as<V>();
+  if constexpr (isBplusCandidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_beauty::DecayChannelMain::BplusToD0Pi) {
+      candidateDaughterParticle = candidate.template prong2_as<U>().template mcParticle_as<V>();
+    }
   }
-  if (std::abs(candidate.flagMcMatchRec()) == o2::aod::hf_cand_xic_to_xi_pi_pi::DecayType::XicToXiPiPi) {
-    candidateDaughterParticle = candidate.template prong1_as<U>().template mcParticle_as<V>();
+  if constexpr (isXicToXiPiPiCandidate<T>()) {
+    if (std::abs(candidate.flagMcMatchRec()) == o2::aod::hf_cand_xic_to_xi_pi_pi::DecayType::XicToXiPiPi) {
+      candidateDaughterParticle = candidate.template prong0_as<U>().template mcParticle_as<V>();
+    }
   }
-
   return candidateDaughterParticle.template mothers_first_as<V>();
 }
 
+/**
+ * returns the index of the JMcParticle matched to the HF candidate
+ *
+ * @param candidate hf candidate that is being checked
+ * @param tracks track table
+ * @param particles particle table
+ */
+template <typename T, typename U, typename V>
+auto matchedHFParticleId(const T& candidate, const U& tracks, const V& particles)
+{
+  return (matchedHFParticle(candidate, tracks, particles)).globalIndex();
+}
+
 /**
  * returns a slice of the table depending on the index of the HF candidate
  *