Major fix: use robust Join between V0Cores and V0CoresMc.

Author: mfaggin

PWGHF/Tasks/taskPidStudies.cxx

@@ -204,8 +204,8 @@ struct HfTaskPidStudies {
                               aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr>;
   using CollSels = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::CentFT0Ms>;
   using CollisionsMc = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0Cs, aod::CentFT0Ms>;
-  using V0sMcRec = soa::Join<aod::V0Datas, aod::V0CoreMCLabels>;
-  using CascsMcRec = soa::Join<aod::CascDatas, aod::CascCoreMCLabels>;
+  using V0sMcRec = soa::Join<aod::V0Datas, aod::V0MCCores>;
+  using CascsMcRec = soa::Join<aod::CascDatas, aod::CascMCCores>;
 
   ctpRateFetcher rateFetcher;
   HfEventSelection hfEvSel;
@@ -305,45 +305,32 @@ struct HfTaskPidStudies {
   }
 
   template <typename T1>
-  int isMatched(const T1& cand, int mcCoresSize)
+  int isMatched(const T1& cand)
   {
     if constexpr (std::is_same<T1, V0sMcRec::iterator>::value) {
-      if (!cand.has_v0MCCore()) {
-        return Particle::NotMatched;
-      }
-      auto v0MC = cand.template v0MCCore_as<aod::V0MCCores>();
-      int v0MCId = cand.v0MCCoreId();
-      if (v0MCId >= mcCoresSize) {
-        // LOG(warn) << "v0MCId (" << v0MCId << ") >= MCCores size (" << mcCoresSize << "). Some issue in the data model?";
-        return Particle::NotMatched;
-      }
-      if (v0MC.pdgCode() == kK0Short && v0MC.pdgCodeNegative() == -kPiPlus && v0MC.pdgCodePositive() == kPiPlus) {
+      if (cand.pdgCode() == kK0Short && cand.pdgCodeNegative() == -kPiPlus && cand.pdgCodePositive() == kPiPlus) {
         return Particle::K0s;
       }
-      if (v0MC.pdgCode() == kLambda0 && v0MC.pdgCodeNegative() == -kPiPlus && v0MC.pdgCodePositive() == kProton) {
+      if (cand.pdgCode() == kLambda0 && cand.pdgCodeNegative() == -kPiPlus && cand.pdgCodePositive() == kProton) {
         return Particle::Lambda;
       }
-      if (v0MC.pdgCode() == -kLambda0 && v0MC.pdgCodeNegative() == -kProton && v0MC.pdgCodePositive() == kPiPlus) {
+      if (cand.pdgCode() == -kLambda0 && cand.pdgCodeNegative() == -kProton && cand.pdgCodePositive() == kPiPlus) {
         return -Particle::Lambda;
       }
     }
     if constexpr (std::is_same<T1, CascsMcRec::iterator>::value) {
-      if (!cand.has_cascMCCore()) {
-        return Particle::NotMatched;
-      }
-      auto cascMC = cand.template cascMCCore_as<aod::CascMCCores>();
-      if (cascMC.pdgCode() == kOmegaMinus &&
-          cascMC.pdgCodeBachelor() == -kKPlus &&
-          cascMC.pdgCodeV0() == kLambda0 &&
-          cascMC.pdgCodePositive() == kProton &&
-          cascMC.pdgCodeNegative() == -kPiPlus) {
+      if (cand.pdgCode() == kOmegaMinus &&
+          cand.pdgCodeBachelor() == -kKPlus &&
+          cand.pdgCodeV0() == kLambda0 &&
+          cand.pdgCodePositive() == kProton &&
+          cand.pdgCodeNegative() == -kPiPlus) {
         return Particle::Omega;
       }
-      if (cascMC.pdgCode() == -kOmegaMinus &&
-          cascMC.pdgCodeBachelor() == kKPlus &&
-          cascMC.pdgCodeV0() == -kLambda0 &&
-          cascMC.pdgCodePositive() == kPiPlus &&
-          cascMC.pdgCodeNegative() == -kProton) {
+      if (cand.pdgCode() == -kOmegaMinus &&
+          cand.pdgCodeBachelor() == kKPlus &&
+          cand.pdgCodeV0() == -kLambda0 &&
+          cand.pdgCodePositive() == kPiPlus &&
+          cand.pdgCodeNegative() == -kProton) {
         return -Particle::Omega;
       }
     }
@@ -527,8 +514,7 @@ struct HfTaskPidStudies {
         continue;
       }
       if (isSelectedV0AsK0s(v0) || isSelectedV0AsLambda(v0)) {
-        int const v0MCCoresSize = v0MCCores.size();
-        int const matched = isMatched(v0, v0MCCoresSize);
+        int const matched = isMatched(v0);
         if (matched != Particle::NotMatched) {
           fillTree<true, CollisionsMc>(v0, matched);
         }
@@ -571,8 +557,7 @@ struct HfTaskPidStudies {
         continue;
       }
       if (isSelectedCascAsOmega<CollisionsMc>(casc)) {
-        int const cascMCCoresSize = cascMCCores.size();
-        int const matched = isMatched(casc, cascMCCoresSize);
+        int const matched = isMatched(casc);
         if (matched != Particle::NotMatched) {
           fillTree<false, CollisionsMc>(casc, matched);
         }