Moved V0 signal flags into candidate definition

Author: GijsvWeelden

PWGJE/DataModel/Jet.h

@@ -35,6 +35,7 @@
 #include "PWGHF/DataModel/DerivedTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/V0SelectorTables.h"
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
 
 namespace o2::aod
@@ -244,8 +245,8 @@ using JetParticlesSubBplus = JMcParticleBplusSubs;
 using McCollisionsBplus = o2::soa::Join<HfBplusMcCollBases, JBplusMcCollisionIds>;
 using CandidatesBplusMCP = o2::soa::Join<HfBplusPBases, JBplusPIds>;
 
-using CandidatesV0Data = o2::soa::Join<V0Cores, JV0Ids>;
-using CandidatesV0MCD = o2::soa::Join<V0Cores, V0MCCores, JV0Ids>;
+using CandidatesV0Data = o2::soa::Join<V0Cores, JV0Ids, V0SignalFlags>;
+using CandidatesV0MCD = o2::soa::Join<V0Cores, V0MCCores, JV0Ids, V0SignalFlags>;
 // using V0Daughters = DauTrackExtras;
 using McCollisionsV0 = o2::soa::Join<JV0McCollisions, JV0McCollisionIds>;
 using CandidatesV0MCP = o2::soa::Join<JV0Mcs, JV0McIds>;

PWGJE/JetFinders/jetFinderV0DataCharged.cxx

@@ -15,7 +15,7 @@
 
 #include "PWGJE/JetFinders/jetFinderV0.cxx"
 
-using JetFinderV0DataCharged = JetFinderV0Task<soa::Join<aod::CandidatesV0Data, aod::V0SignalFlags>, soa::Join<aod::CandidatesV0MCD, aod::V0SignalFlags>, aod::CandidatesV0MCP, aod::V0ChargedJets, aod::V0ChargedJetConstituents>;
+using JetFinderV0DataCharged = JetFinderV0Task<aod::CandidatesV0Data, aod::CandidatesV0MCD, aod::CandidatesV0MCP, aod::V0ChargedJets, aod::V0ChargedJetConstituents>;
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {

PWGJE/JetFinders/jetFinderV0MCDCharged.cxx

@@ -15,7 +15,7 @@
 
 #include "PWGJE/JetFinders/jetFinderV0.cxx"
 
-using JetFinderV0MCDetectorLevelCharged = JetFinderV0Task<soa::Join<aod::CandidatesV0Data, aod::V0SignalFlags>, soa::Join<aod::CandidatesV0MCD, aod::V0SignalFlags>, aod::CandidatesV0MCP, aod::V0ChargedMCDetectorLevelJets, aod::V0ChargedMCDetectorLevelJetConstituents>;
+using JetFinderV0MCDetectorLevelCharged = JetFinderV0Task<aod::CandidatesV0Data, aod::CandidatesV0MCD, aod::CandidatesV0MCP, aod::V0ChargedMCDetectorLevelJets, aod::V0ChargedMCDetectorLevelJetConstituents>;
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {

PWGJE/JetFinders/jetFinderV0MCPCharged.cxx

@@ -15,7 +15,7 @@
 
 #include "PWGJE/JetFinders/jetFinderV0.cxx"
 
-using JetFinderV0MCParticleLevelCharged = JetFinderV0Task<soa::Join<aod::CandidatesV0Data, aod::V0SignalFlags>, soa::Join<aod::CandidatesV0MCD, aod::V0SignalFlags>, aod::CandidatesV0MCP, aod::V0ChargedMCParticleLevelJets, aod::V0ChargedMCParticleLevelJetConstituents>;
+using JetFinderV0MCParticleLevelCharged = JetFinderV0Task<aod::CandidatesV0Data, aod::CandidatesV0MCD, aod::CandidatesV0MCP, aod::V0ChargedMCParticleLevelJets, aod::V0ChargedMCParticleLevelJetConstituents>;
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {

PWGJE/Tasks/jetFragmentation.cxx

@@ -56,9 +56,9 @@ using MatchedMCPJetsWithConstituents = soa::Join<MCPJets, aod::ChargedMCParticle
 
 // V0 jets
 using DataV0JetsWithConstituents = soa::Join<aod::V0ChargedJets, aod::V0ChargedJetConstituents>;
-using CandidatesV0DataWithFlags = soa::Join<aod::CandidatesV0Data, aod::V0SignalFlags>;
+using CandidatesV0DataWithFlags = aod::CandidatesV0Data;
 
-using CandidatesV0MCDWithLabelsAndFlags = soa::Join<aod::CandidatesV0MCD, aod::McV0Labels, aod::V0SignalFlags>;
+using CandidatesV0MCDWithLabelsAndFlags = soa::Join<aod::CandidatesV0MCD, aod::McV0Labels>;
 using MCDV0Jets = aod::V0ChargedMCDetectorLevelJets;
 using MCDV0JetsWithConstituents = soa::Join<MCDV0Jets, aod::V0ChargedMCDetectorLevelJetConstituents>;
 using MatchedMCDV0Jets = soa::Join<MCDV0Jets, aod::V0ChargedMCDetectorLevelJetsMatchedToV0ChargedMCParticleLevelJets>;

PWGJE/Tasks/v0QA.cxx

@@ -47,7 +47,7 @@ using MCDV0JetsWithConstituents = soa::Join<MCDV0Jets, aod::V0ChargedMCDetectorL
 using MatchedMCDV0Jets = soa::Join<MCDV0Jets, aod::V0ChargedMCDetectorLevelJetsMatchedToV0ChargedMCParticleLevelJets>;
 using MatchedMCDV0JetsWithConstituents = soa::Join<MCDV0Jets, aod::V0ChargedMCDetectorLevelJetConstituents, aod::V0ChargedMCDetectorLevelJetsMatchedToV0ChargedMCParticleLevelJets>;
 
-using CandidatesV0MCDWithFlags = soa::Join<aod::CandidatesV0MCD, aod::McV0Labels, aod::V0SignalFlags>;
+using CandidatesV0MCDWithFlags = soa::Join<aod::CandidatesV0MCD, aod::McV0Labels>;
 
 using MCPV0Jets = aod::V0ChargedMCParticleLevelJets;
 using MCPV0JetsWithConstituents = soa::Join<MCPV0Jets, aod::V0ChargedMCParticleLevelJetConstituents>;
@@ -1221,7 +1221,7 @@ struct V0QA {
 
   using DaughterJTracks = soa::Join<aod::JetTracks, aod::JTrackPIs>;
   using DaughterTracks = soa::Join<aod::FullTracks, aod::TracksDCA, aod::TrackSelection, aod::TracksCov>;
-  void processV0TrackQA(aod::JetCollision const& /*jcoll*/, soa::Join<aod::CandidatesV0Data, aod::V0SignalFlags> const& v0s, DaughterJTracks const&, DaughterTracks const&)
+  void processV0TrackQA(aod::JetCollision const& /*jcoll*/, aod::CandidatesV0Data const& v0s, DaughterJTracks const&, DaughterTracks const&)
   {
     //   if (!jetderiveddatautilities::selectCollision(jcoll, eventSelectionBits)) {
     //     return;