[PWGEM,PWGEM-36] PhotonMeson: photonResoTask bug fixes and full mc pa…

PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h

@@ -634,8 +634,8 @@ struct Pi0EtaToGammaGammaMC {
             photonid1 = o2::aod::pwgem::dilepton::utils::mcutil::FindCommonMotherFrom2Prongs(pos1mc, ele1mc, -11, 11, 22, mcparticles);
             photonid2 = o2::aod::pwgem::dilepton::utils::mcutil::FindCommonMotherFrom2Prongs(pos2mc, ele2mc, -11, 11, 22, mcparticles);
           } else if constexpr (pairtype == o2::aod::pwgem::photonmeson::photonpair::PairType::kEMCEMC) {
-            auto cluster1mcparticle = mcparticles.iteratorAt(g1.emmcparticleId());
-            auto cluster2mcparticle = mcparticles.iteratorAt(g2.emmcparticleId());
+            auto cluster1mcparticle = mcparticles.iteratorAt(g1.emmcparticleIds()[0]);
+            auto cluster2mcparticle = mcparticles.iteratorAt(g2.emmcparticleIds()[0]);
 
             photonid1 = o2::aod::pwgem::photonmeson::utils::mcutil::FindMotherInChain(cluster1mcparticle, mcparticles, std::vector<int>{111, 221});
             photonid2 = o2::aod::pwgem::photonmeson::utils::mcutil::FindMotherInChain(cluster2mcparticle, mcparticles, std::vector<int>{111, 221});

PWGEM/PhotonMeson/Core/V0PhotonCut.h

@@ -897,23 +897,20 @@ class V0PhotonCut : public TNamed
   }
 
   template <o2::soa::is_iterator TMCPhoton>
-  bool IsConversionPointInAcceptance(TMCPhoton const& mcphoton) const
+  bool IsConversionPointInAcceptance(TMCPhoton const& mcphoton, float convRadius) const
   {
-
-    float rGenXY = std::sqrt(std::pow(mcphoton.vx(), 2) + std::pow(mcphoton.vy(), 2));
-
     // eta cut
-    if (mcphoton.eta() >= mMinV0Eta && mcphoton.eta() <= mMaxV0Eta) {
+    if (mcphoton.eta() < mMinV0Eta || mcphoton.eta() > mMaxV0Eta) {
       return false;
     }
 
     // radius cut
-    if (rGenXY < mMinRxy || mMaxRxy < rGenXY) {
+    if (convRadius < mMinRxy || mMaxRxy < convRadius) {
       return false;
     }
 
     // line cut
-    if (rGenXY < std::abs(mcphoton.vz()) * std::tan(2 * std::atan(std::exp(-mMaxV0Eta))) - mMaxMarginZ) {
+    if (convRadius <= std::abs(mcphoton.vz()) * std::tan(2 * std::atan(std::exp(-mMaxV0Eta))) - mMaxMarginZ) {
       return false;
     }
 

PWGEM/PhotonMeson/DataModel/gammaTables.h

@@ -98,25 +98,25 @@ using V0LegMCLabel = V0LegMCLabels::iterator;
 // *  EMC cluster mc label tables:
 // 1. EMCALMCClusters in EMCalClusters.h: Vectors of global mc particle ids and energy fractions of the cluster
 // 2. EMCClusterMCLabels: Vector of global mc particle ids
-// 3. EMEMCClusterMCLabels: EM MC particle ID of largest contributor to cluster
+// 3. EMEMCClusterMCLabels: Vector of EM MC particle ID of largest contributor to cluster
 namespace emcclustermclabel
 {
-DECLARE_SOA_ARRAY_INDEX_COLUMN(EMMCParticle, emmcparticle); //!
+DECLARE_SOA_ARRAY_INDEX_COLUMN(McParticle, emmcparticle) //!
 } // namespace emcclustermclabel
 
 // NOTE: MC labels. This table has one vector of global mc particle ids for each reconstructed emc cluster (joinable with emccluster table)
 DECLARE_SOA_TABLE(EMCClusterMCLabels, "AOD", "EMCClsMCLABEL", //!
-                  emcclustermclabel::EMMCParticleIds);
+                  emcclustermclabel::McParticleIds);
 using EMCClusterMCLabel = EMCClusterMCLabels::iterator;
 
 namespace ememcclustermclabel
 {
-DECLARE_SOA_INDEX_COLUMN(EMMCParticle, emmcparticle); //!
+DECLARE_SOA_ARRAY_INDEX_COLUMN(EMMCParticle, emmcparticle); //!
 } // namespace ememcclustermclabel
 
-// NOTE: MC labels. This table has one entry for each reconstructed emc cluster (joinable with emccluster table)
+// NOTE: MC labels. This table has a vector of entries for each reconstructed emc cluster (joinable with emccluster table)
 DECLARE_SOA_TABLE(EMEMCClusterMCLabels, "AOD", "EMEMCClsMCLABEL", //!
-                  ememcclustermclabel::EMMCParticleId);
+                  ememcclustermclabel::EMMCParticleIds);
 using EMEMCClusterMCLabel = EMEMCClusterMCLabels::iterator;
 
 namespace v0leg