From 6f94d2591dc7f01411c027bf4d2b72a7565b30ed Mon Sep 17 00:00:00 2001
From: Stefanie Mrozinski <smrozins@cern.ch>
Date: Sun, 3 Aug 2025 19:26:33 +0200
Subject: [PATCH 1/3] Deleted V0TOFNsigma subscription + updates table
 subscription

---
 PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx b/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
index 5512191322c..4c252b86b20 100644
--- a/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
+++ b/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
@@ -81,7 +81,7 @@ using MyStraCollision = MyStraCollisions::iterator;
 using MyTracksIUMC = soa::Join<aod::TracksIU, aod::McTrackLabels>;
 using MyMCParticles = aod::McParticles;
 
-using V0DerivedMCDatas = soa::Join<aod::V0Cores, aod::V0CollRefs, aod::V0Extras, aod::V0Indices, aod::V0TOFNSigmas, aod::V0MCMothers, aod::V0CoreMCLabels, aod::V0LambdaMLScores, aod::V0AntiLambdaMLScores, aod::V0GammaMLScores>;
+using V0DerivedMCDatas = soa::Join<aod::V0Cores, aod::V0CollRefs, aod::V0Extras, aod::V0Indices, aod::V0MCMothers, aod::V0CoreMCLabels, aod::V0GammaMLScores>;
 
 using dauTracks = soa::Join<aod::DauTrackExtras, aod::DauTrackTPCPIDs>;
 
@@ -637,7 +637,8 @@ struct Convbuildercomp {
 
   void processLFV0sMC(MyStraCollisions const& stracollisions,
                       soa::Join<aod::V0MCCores, aod::V0MCCollRefs> const&,
-                      V0DerivedMCDatas const& strangeV0s)
+                      V0DerivedMCDatas const& strangeV0s,
+                      dauTracks const&)
   {
 
     for (auto& collision : stracollisions) {
@@ -728,6 +729,7 @@ struct Convbuildercomp {
   PresliceUnsorted<aod::EMMCParticles> perMcCollision = aod::emmcparticle::emmceventId;
 
   void processConvV0s(MyCollisions const& collisions,
+                      MyMCCollisions const& mccollisions,
                       aod::EMMCParticles const& mcparticles,
                       MyTracksIUMC const& tracks)
   {
@@ -785,15 +787,15 @@ struct Convbuildercomp {
     }
   }
 
-  Preslice<MyV0Photons> perEMCollision = aod::v0photonkf::emeventId;
-
   void processMatchCategories(
     MyCollisions const& collisions,
+    aod::EMMCEvents const&,
     MyTracksIUMC const& tracksgen,
     MyV0Photons const& emV0s,
     soa::Join<aod::V0MCCores, aod::V0MCCollRefs> const&,
     V0DerivedMCDatas const& lfV0s,
     MyMCV0Legs const&,
+    aod::EMMCParticles const&,
     aod::McParticles const& mcparticles,
     dauTracks const&)
   {
@@ -811,7 +813,7 @@ struct Convbuildercomp {
 
       fillEventInfo<1, EMBuilder>(collision);
 
-      auto emSlice = emV0s.sliceBy(perEMCollision, collision.globalIndex());
+      auto emSlice = emV0s.sliceBy(perCollision, collision.globalIndex());
       auto lfSlice = lfV0s.sliceBy(perCollisionMCDerived, collision.globalIndex());
 
       using EMIt = decltype(emSlice.begin());

From 84bbe118ea124f30aae83bcf9075bcbc9933e1f9 Mon Sep 17 00:00:00 2001
From: Stefanie Mrozinski <smrozins@cern.ch>
Date: Sun, 3 Aug 2025 20:07:47 +0200
Subject: [PATCH 2/3] Fixed warnings

---
 PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx b/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
index 4c252b86b20..73911f7bfca 100644
--- a/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
+++ b/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
@@ -729,7 +729,7 @@ struct Convbuildercomp {
   PresliceUnsorted<aod::EMMCParticles> perMcCollision = aod::emmcparticle::emmceventId;
 
   void processConvV0s(MyCollisions const& collisions,
-                      MyMCCollisions const& mccollisions,
+                      MyMCCollisions const& mccollision,
                       aod::EMMCParticles const& mcparticles,
                       MyTracksIUMC const& tracks)
   {

From a6c074d0def1e4b05ab71ab9c744bdcd3513d177 Mon Sep 17 00:00:00 2001
From: Stefanie Mrozinski <smrozins@cern.ch>
Date: Sun, 3 Aug 2025 21:03:45 +0200
Subject: [PATCH 3/3] Fixed warning

---
 PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx b/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
index 73911f7bfca..90710659c74 100644
--- a/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
+++ b/PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
@@ -729,7 +729,7 @@ struct Convbuildercomp {
   PresliceUnsorted<aod::EMMCParticles> perMcCollision = aod::emmcparticle::emmceventId;
 
   void processConvV0s(MyCollisions const& collisions,
-                      MyMCCollisions const& mccollision,
+                      MyMCCollisions const&,
                       aod::EMMCParticles const& mcparticles,
                       MyTracksIUMC const& tracks)
   {