[PWGLF] Fix items for particle efficiency computation (#14575)

Author: scannito

PWGLF/DataModel/LFPhiStrangeCorrelationTables.h

@@ -69,6 +69,9 @@ DECLARE_SOA_COLUMN(PhimesonSel, phimesonSel, bool);
 DECLARE_SOA_TABLE(PhimesonSelectionData, "AOD", "PHIINCOLLDATA",
                   lf_selection_phi_collision::PhimesonSel);
 
+/*DECLARE_SOA_TABLE(PhimesonSelectionMcReco, "AOD", "PHIINCOLLMCRECO",
+                  lf_selection_phi_collision::PhimesonSel);*/
+
 DECLARE_SOA_TABLE(PhimesonSelectionMcGen, "AOD", "PHIINCOLLMCGEN",
                   lf_selection_phi_collision::PhimesonSel);
 } // namespace o2::aod

PWGLF/TableProducer/Strangeness/phiStrangeCorrelator.cxx

@@ -324,6 +324,7 @@ struct PhiMesonCandProducer {
 struct PhiMesonSelCollision {
   // Produce the table with the event selection information
   Produces<aod::PhimesonSelectionData> phimesonSelectionData;
+  // Produces<aod::PhimesonSelectionMcReco> phimesonSelectionMcReco;
   Produces<aod::PhimesonSelectionMcGen> phimesonSelectionMcGen;
 
   HistogramRegistry histos{"eventSelection", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
@@ -508,6 +509,7 @@ struct PhiMesonSelCollision {
 
   void processMCReco(SimCollisions::iterator const& collision, MCCollisions const&, aod::PhimesonCandidatesData const& phiCandidatesData)
   {
+    // phimesonSelectionMcReco(defaultEventSelection<true, MCCollisions>(collision) && selectionType == 1 ? eventHasPhi<true, MCCollisions>(collision, phiCandidatesData) : true);
     phimesonSelectionData(defaultEventSelection<true, MCCollisions>(collision) && selectionType == 1 ? eventHasPhi<true, MCCollisions>(collision, phiCandidatesData) : true);
   }
 

PWGLF/Tasks/Strangeness/phiStrangeCorrelation.cxx

@@ -262,6 +262,7 @@ struct PhiStrangenessCorrelation {
   // Defining the type of the collisions for data and MC
   using SelCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::PVMults, aod::PhimesonSelectionData>>;
   using SimCollisions = soa::Join<SelCollisions, aod::McCollisionLabels>;
+  // using SimCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::PVMults, aod::PhimesonSelectionMcReco, aod::McCollisionLabels>>;
   using MCCollisions = soa::Filtered<soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::PhimesonSelectionMcGen>>;
 
   // Defining the type of the V0s and corresponding daughter tracks for data and MC
@@ -280,10 +281,11 @@ struct PhiStrangenessCorrelation {
 
   // Preslice for manual slicing
   struct : PresliceGroup {
-    Preslice<SimCollisions> collPerMCCollision = aod::mccollisionlabel::mcCollisionId;
+    // Preslice<SimCollisions> collPerMCCollision = aod::mccollisionlabel::mcCollisionId;
     Preslice<FullMCV0s> v0PerCollision = aod::v0::collisionId;
     Preslice<FullMCTracks> trackPerCollision = aod::track::collisionId;
     // Preslice<aod::PhimesonCandidatesData> phiCandDataPerCollision = aod::lf_selection_phi_candidate::collisionId;
+    // PresliceUnsorted<SimCollisions> collPerMCCollision = aod::mccollisionlabel::mcCollisionId;
     PresliceUnsorted<aod::PhimesonCandidatesMcReco> phiCandPerCollision = aod::lf_selection_phi_candidate::collisionId;
 
     // Preslice<aod::McParticles> mcPartPerMCCollision = aod::mcparticle::mcCollisionId;
@@ -412,8 +414,13 @@ struct PhiStrangenessCorrelation {
   template <bool isMC, typename T1, typename T2>
   bool selectionV0(const T1& v0, const T2& collision)
   {
-    const auto& posDaughterTrack = v0.template posTrack_as<V0DauTracks>();
-    const auto& negDaughterTrack = v0.template negTrack_as<V0DauTracks>();
+    using V0DauTrackType = std::conditional_t<isMC, V0DauMCTracks, V0DauTracks>;
+
+    const auto& posDaughterTrack = v0.template posTrack_as<V0DauTrackType>();
+    const auto& negDaughterTrack = v0.template negTrack_as<V0DauTrackType>();
+
+    // const auto& posDaughterTrack = v0.template posTrack_as<V0DauTracks>();
+    // const auto& negDaughterTrack = v0.template negTrack_as<V0DauTracks>();
 
     if (!selectionTrackStrangeness(posDaughterTrack) || !selectionTrackStrangeness(negDaughterTrack))
       return false;
@@ -638,14 +645,14 @@ struct PhiStrangenessCorrelation {
   PROCESS_SWITCH(PhiStrangenessCorrelation, processPhiK0SPionDataME, "Process function for Phi-K0S and Phi-Pion Deltay and Deltaphi 2D Correlations in Data ME", true);
   */
 
-  void processParticleEfficiency(MCCollisions::iterator const& mcCollision, SimCollisions const& collisions, FullMCTracks const& fullMCTracks, FullMCV0s const& V0s, V0DauMCTracks const&, aod::McParticles const& mcParticles, aod::PhimesonCandidatesMcReco const& phiCandidatesMcReco)
+  void processParticleEfficiency(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, FullMCTracks const& fullMCTracks, FullMCV0s const& V0s, V0DauMCTracks const&, aod::McParticles const& mcParticles, aod::PhimesonCandidatesMcReco const& phiCandidatesMcReco)
   {
     uint16_t numberAssocColls{0};
     std::vector<float> zVtxs;
 
-    const auto collsThisMCColl = collisions.sliceBy(preslices.collPerMCCollision, mcCollision.globalIndex());
+    // const auto collsThisMCColl = collisions.sliceBy(preslices.collPerMCCollision, mcCollision.globalIndex());
 
-    for (const auto& collision : collsThisMCColl) {
+    for (const auto& collision : collisions) {
       histos.fill(HIST("event/hRecoMCMultiplicityPercent"), mcCollision.centFT0M());
       histos.fill(HIST("event/h2RecoMCVertexZvsMult"), collision.posZ(), mcCollision.centFT0M());
 
@@ -737,7 +744,7 @@ struct PhiStrangenessCorrelation {
 
       switch (std::abs(mcParticle.pdgCode())) {
         case o2::constants::physics::Pdg::kPhi:
-          if (selectionType == 0 && mcParticle.isPhysicalPrimary() && mcParticle.pt() >= phiConfigs.minPhiPt)
+          if (selectionType == 0 && mcParticle.pt() >= phiConfigs.minPhiPt)
             fillGenHistos(HIST("phi/h3PhiMCGen"), HIST("phi/h4PhiMCGenAssocReco"), mcParticle);
           break;
         case PDG_t::kK0Short: