PWGHF: New features in LcpKpi task and tree creator (#4769)

Co-authored-by: Luigi Dello Stritto <ldellost@alicecerno2.cern.ch>

Author: DelloStritto

PWGHF/TableProducer/candidateSelectorLc.cxx

@@ -365,17 +365,12 @@ struct HfCandidateSelectorLc {
         continue;
       }
 
-      if ((pidLcToPKPi == -1 || pidLcToPKPi == 1) && (pidBayesLcToPKPi == -1 || pidBayesLcToPKPi == 1) && topolLcToPKPi) {
-        statusLcToPKPi = 1; // identified as LcToPKPi
-      }
-      if ((pidLcToPiKP == -1 || pidLcToPiKP == 1) && (pidBayesLcToPiKP == -1 || pidBayesLcToPiKP == 1) && topolLcToPiKP) {
-        statusLcToPiKP = 1; // identified as LcToPiKP
-      }
-
+      bool isSelectedMlLcToPKPi = true;
+      bool isSelectedMlLcToPiKP = true;
       if (applyMl) {
         // ML selections
-        bool isSelectedMlLcToPKPi = false;
-        bool isSelectedMlLcToPiKP = false;
+        isSelectedMlLcToPKPi = false;
+        isSelectedMlLcToPiKP = false;
 
         if ((pidLcToPKPi == -1 || pidLcToPKPi == 1) && (pidBayesLcToPKPi == -1 || pidBayesLcToPKPi == 1) && topolLcToPKPi) {
           std::vector<float> inputFeaturesLcToPKPi = hfMlResponse.getInputFeatures(candidate, trackPos1, trackNeg, trackPos2);
@@ -398,6 +393,13 @@ struct HfCandidateSelectorLc {
         }
       }
 
+      if ((pidLcToPKPi == -1 || pidLcToPKPi == 1) && (pidBayesLcToPKPi == -1 || pidBayesLcToPKPi == 1) && isSelectedMlLcToPKPi && topolLcToPKPi) {
+        statusLcToPKPi = 1; // identified as LcToPKPi
+      }
+      if ((pidLcToPiKP == -1 || pidLcToPiKP == 1) && (pidBayesLcToPiKP == -1 || pidBayesLcToPiKP == 1) && isSelectedMlLcToPiKP && topolLcToPiKP) {
+        statusLcToPiKP = 1; // identified as LcToPiKP
+      }
+
       hfSelLcCandidate(statusLcToPKPi, statusLcToPiKP);
     }
   }

PWGHF/TableProducer/treeCreatorLcToPKPi.cxx

@@ -25,6 +25,7 @@
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/Centrality.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -84,10 +85,11 @@ DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle);
 DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision);
 DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int);
 DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
-DECLARE_SOA_COLUMN(MultZeqFT0A, multZeqFT0A, float);
-DECLARE_SOA_COLUMN(MultZeqFT0C, multZeqFT0C, float);
-DECLARE_SOA_COLUMN(MultFT0M, multFT0M, float);
-DECLARE_SOA_COLUMN(MultZeqFV0A, multZeqFV0A, float);
+DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float);
+DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float);
+DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
+DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float);
+DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float);
 DECLARE_SOA_COLUMN(MultZeqNTracksPV, multZeqNTracksPV, float);
 } // namespace full
 
@@ -227,10 +229,11 @@ DECLARE_SOA_TABLE(HfCandLcFullEvs, "AOD", "HFCANDLCFULLEV",
                   collision::PosZ,
                   full::IsEventReject,
                   full::RunNumber,
-                  full::MultZeqFT0A,
-                  full::MultZeqFT0C,
-                  full::MultFT0M,
-                  full::MultZeqFV0A,
+                  full::CentFT0A,
+                  full::CentFT0C,
+                  full::CentFT0M,
+                  full::CentFV0A,
+                  full::CentFDDM,
                   full::MultZeqNTracksPV);
 
 DECLARE_SOA_TABLE(HfCandLcFullPs, "AOD", "HFCANDLCFULLP",
@@ -263,12 +266,13 @@ struct HfTreeCreatorLcToPKPi {
   HfHelper hfHelper;
 
   using TracksWPid = soa::Join<aod::Tracks, aod::TracksPidPiExt, aod::TracksPidKaExt, aod::TracksPidPrExt>;
+  using Cents = soa::Join<aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFDDMs>;
 
   void init(InitContext const&)
   {
   }
 
-  void processMc(soa::Join<aod::Collisions, aod::McCollisionLabels, aod::Mults, aod::MultZeqs> const& collisions,
+  void processMc(soa::Join<aod::Collisions, aod::McCollisionLabels, aod::MultZeqs, Cents> const& collisions,
                  aod::McCollisions const& mcCollisions,
                  soa::Join<aod::HfCand3Prong, aod::HfCand3ProngMcRec, aod::HfSelLc> const& candidates,
                  soa::Join<aod::McParticles, aod::HfCand3ProngMcGen> const& particles,
@@ -287,10 +291,11 @@ struct HfTreeCreatorLcToPKPi {
         collision.posZ(),
         0,
         collision.bc().runNumber(),
-        collision.multZeqFT0A(),
-        collision.multZeqFT0C(),
-        collision.multFT0M(),
-        collision.multZeqFV0A(),
+        collision.centFT0A(),
+        collision.centFT0C(),
+        collision.centFT0M(),
+        collision.centFV0A(),
+        collision.centFDDM(),
         collision.multZeqNTracksPV());
     }
 
@@ -474,7 +479,7 @@ struct HfTreeCreatorLcToPKPi {
   }
   PROCESS_SWITCH(HfTreeCreatorLcToPKPi, processMc, "Process MC tree writer", true);
 
-  void processData(soa::Join<aod::Collisions, aod::Mults, aod::MultZeqs> const& collisions,
+  void processData(soa::Join<aod::Collisions, aod::MultZeqs, Cents> const& collisions,
                    soa::Join<aod::HfCand3Prong, aod::HfSelLc> const& candidates,
                    TracksWPid const& tracks, aod::BCs const&)
   {
@@ -491,10 +496,11 @@ struct HfTreeCreatorLcToPKPi {
         collision.posZ(),
         0,
         collision.bc().runNumber(),
-        collision.multZeqFT0A(),
-        collision.multZeqFT0C(),
-        collision.multFT0M(),
-        collision.multZeqFV0A(),
+        collision.centFT0A(),
+        collision.centFT0C(),
+        collision.centFT0M(),
+        collision.centFV0A(),
+        collision.centFDDM(),
         collision.multZeqNTracksPV());
     }