PWGHF: Implement the possibility to apply proton PID for baryons in s…

…kimming (AliceO2Group#3939) * PWGHF: Implent the possibility to apply proton PID for baryons in HF finding * Please consider the following formatting changes * Restore author removed by mistake * Remove all MY_DEBUG instances * Restore line wrongly deleted * Fallback to fill PVrefit table for all tracks at once to avoid crash due to tracks with no collision * Move initialisation of whichHypo * Add check on hasTPC and hasTOF in case of single detector PID * Remove extra slash --------- Co-authored-by: ALICE Action Bot <[email protected]>
ddobrigk · Nov 27, 2023 · 81fd875 · 81fd875
1 parent f75d3f3
commit 81fd875
Show file tree

Hide file tree

Showing 6 changed files with 394 additions and 335 deletions.
diff --git a/PWGHF/Core/SelectorCuts.h b/PWGHF/Core/SelectorCuts.h
@@ -63,6 +63,16 @@ static const std::vector<std::string> labelsPtTrack{};
 static const std::vector<std::string> labelsCutVarTrack = {"min_dcaxytoprimary", "max_dcaxytoprimary"};
 } // namespace hf_cuts_single_track
 
+namespace hf_presel_proton_pid
+{
+// default values for the PID cuts for protons in the track-index-skim-creator
+constexpr float cutsProtonPid[3][6] = {{0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f},
+                                       {0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f},
+                                       {0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f}};
+static const std::vector<std::string> labelsCutsProtonPid = {"minPtTpc", "maxPtTpc", "nSigmaMaxTpc", "minPtTof", "maxPtTof", "nSigmaMaxTof"};
+static const std::vector<std::string> labelsRowsProtonPid = {"LcToPKPi", "XicToPKPi", "LcToPK0S"};
+} // namespace hf_presel_proton_pid
+
 namespace hf_cuts_bdt_multiclass
 {
 static constexpr int nBinsPt = 1;

diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h
@@ -153,10 +153,12 @@ DECLARE_SOA_TABLE(HfSelCollision, "AOD", "HFSELCOLLISION", //!
 namespace hf_sel_track
 {
 DECLARE_SOA_COLUMN(IsSelProng, isSelProng, int); //!
+DECLARE_SOA_COLUMN(IsProton, isProton, int8_t);  //!
 } // namespace hf_sel_track
 
 DECLARE_SOA_TABLE(HfSelTrack, "AOD", "HFSELTRACK", //!
-                  hf_sel_track::IsSelProng);
+                  hf_sel_track::IsSelProng,
+                  hf_sel_track::IsProton);
 
 namespace hf_pv_refit_track
 {

diff --git a/PWGHF/TableProducer/candidateCreatorCascade.cxx b/PWGHF/TableProducer/candidateCreatorCascade.cxx
@@ -27,25 +27,11 @@
 
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/Utils/utilsBfieldCCDB.h"
-#include "PWGHF/Utils/utilsDebugLcToK0sP.h"
 
 using namespace o2;
 using namespace o2::analysis;
 using namespace o2::framework;
 
-// #define MY_DEBUG
-
-#ifdef MY_DEBUG
-using MyBigTracks = soa::Join<aod::TracksWCov, aod::McTrackLabels>;
-#define MY_DEBUG_MSG(condition, cmd) \
-  if (condition) {                   \
-    cmd;                             \
-  }
-#else
-using MyBigTracks = aod::TracksWCov;
-#define MY_DEBUG_MSG(condition, cmd)
-#endif
-
 /// Reconstruction of heavy-flavour cascade decay candidates
 struct HfCandidateCreatorCascade {
   Produces<aod::HfCandCascBase> rowCandidateBase;
@@ -72,13 +58,6 @@ struct HfCandidateCreatorCascade {
   o2::base::MatLayerCylSet* lut;
   o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
 
-  // for debugging
-#ifdef MY_DEBUG
-  Configurable<std::vector<int>> indexK0Spos{"indexK0Spos", {729, 2866, 4754, 5457, 6891, 7824, 9243, 9810}, "indices of K0S positive daughters, for debug"};
-  Configurable<std::vector<int>> indexK0Sneg{"indexK0Sneg", {730, 2867, 4755, 5458, 6892, 7825, 9244, 9811}, "indices of K0S negative daughters, for debug"};
-  Configurable<std::vector<int>> indexProton{"indexProton", {717, 2810, 4393, 5442, 6769, 7793, 9002, 9789}, "indices of protons, for debug"};
-#endif
-
   int runNumber{0};
   double massP{0.};
   double massK0s{0.};
@@ -106,15 +85,10 @@ struct HfCandidateCreatorCascade {
 
   void process(aod::Collisions const&,
                aod::HfCascades const& rowsTrackIndexCasc,
-               MyBigTracks const&,
+               aod::TracksWCov const&,
                aod::V0sLinked const&,
                aod::V0Datas const&,
-               aod::BCsWithTimestamps const&
-#ifdef MY_DEBUG
-               ,
-               aod::McParticles const& mcParticles
-#endif
-  )
+               aod::BCsWithTimestamps const&)
   {
     // 2-prong vertex fitter
     o2::vertexing::DCAFitterN<2> df;
@@ -130,7 +104,7 @@ struct HfCandidateCreatorCascade {
     // loop over pairs of track indeces
     for (const auto& casc : rowsTrackIndexCasc) {
 
-      const auto& bach = casc.prong0_as<MyBigTracks>();
+      const auto& bach = casc.prong0_as<aod::TracksWCov>();
       LOGF(debug, "V0 %d in HF cascade %d.", casc.v0Id(), casc.globalIndex());
       if (!casc.has_v0()) {
         LOGF(error, "V0 not there for HF cascade %d. Skipping candidate.", casc.globalIndex());
@@ -144,8 +118,8 @@ struct HfCandidateCreatorCascade {
       }
       LOGF(debug, "V0Data ID: %d", casc.v0_as<aod::V0sLinked>().v0DataId());
       const auto& v0 = casc.v0_as<aod::V0sLinked>().v0Data();
-      const auto& trackV0DaughPos = v0.posTrack_as<MyBigTracks>();
-      const auto& trackV0DaughNeg = v0.negTrack_as<MyBigTracks>();
+      const auto& trackV0DaughPos = v0.posTrack_as<aod::TracksWCov>();
+      const auto& trackV0DaughNeg = v0.negTrack_as<aod::TracksWCov>();
 
       auto collision = casc.collision();
 
@@ -160,18 +134,9 @@ struct HfCandidateCreatorCascade {
       }
       df.setBz(bz);
 
-#ifdef MY_DEBUG
-      auto indexBach = bach.mcParticleId();
-      auto indexV0DaughPos = trackV0DaughPos.mcParticleId();
-      auto indexV0DaughNeg = trackV0DaughNeg.mcParticleId();
-      bool isLc = isLcK0SpFunc(indexBach, indexV0DaughPos, indexV0DaughNeg, indexProton, indexK0Spos, indexK0Sneg);
-#endif
-
-      MY_DEBUG_MSG(isLc, LOG(info) << "Processing the Lc with proton " << indexBach << " trackV0DaughPos " << indexV0DaughPos << " trackV0DaughNeg " << indexV0DaughNeg);
-
       auto trackParCovBach = getTrackParCov(bach);
-      auto trackParCovV0DaughPos = getTrackParCov(trackV0DaughPos); // check that MyBigTracks does not need TracksDCA!
-      auto trackParCovV0DaughNeg = getTrackParCov(trackV0DaughNeg); // check that MyBigTracks does not need TracksDCA!
+      auto trackParCovV0DaughPos = getTrackParCov(trackV0DaughPos); // check that aod::TracksWCov does not need TracksDCA!
+      auto trackParCovV0DaughNeg = getTrackParCov(trackV0DaughNeg); // check that aod::TracksWCov does not need TracksDCA!
       trackParCovV0DaughPos.propagateTo(v0.posX(), bz);             // propagate the track to the X closest to the V0 vertex
       trackParCovV0DaughNeg.propagateTo(v0.negX(), bz);             // propagate the track to the X closest to the V0 vertex
       const std::array<float, 3> vertexV0 = {v0.x(), v0.y(), v0.z()};
@@ -181,10 +146,6 @@ struct HfCandidateCreatorCascade {
 
       // reconstruct the cascade secondary vertex
       if (df.process(trackV0, trackParCovBach) == 0) {
-        MY_DEBUG_MSG(isLc, LOG(info) << "Vertexing failed for Lc candidate");
-        //  if (isLc) {
-        // LOG(info) << "Vertexing failed for Lc with proton " << indexBach << " trackV0DaughPos " << indexV0DaughPos << " trackV0DaughNeg " << indexV0DaughNeg;
-        //}
         continue;
       } else {
         // LOG(info) << "Vertexing succeeded for Lc candidate";
@@ -221,7 +182,6 @@ struct HfCandidateCreatorCascade {
       auto errorDecayLengthXY = std::sqrt(getRotatedCovMatrixXX(covMatrixPV, phi, 0.) + getRotatedCovMatrixXX(covMatrixPCA, phi, 0.));
 
       // fill candidate table rows
-      MY_DEBUG_MSG(isLc, LOG(info) << "IT IS A Lc! Filling for Lc with proton " << indexBach << " trackV0DaughPos " << indexV0DaughPos << " trackV0DaughNeg " << indexV0DaughNeg);
       rowCandidateBase(collision.globalIndex(),
                        collision.posX(), collision.posY(), collision.posZ(),
                        secondaryVertex[0], secondaryVertex[1], secondaryVertex[2],
@@ -258,12 +218,6 @@ struct HfCandidateCreatorCascadeMc {
   Produces<aod::HfCandCascadeMcRec> rowMcMatchRec;
   Produces<aod::HfCandCascadeMcGen> rowMcMatchGen;
 
-#ifdef MY_DEBUG
-  Configurable<std::vector<int>> indexK0Spos{"indexK0Spos", {729, 2866, 4754, 5457, 6891, 7824, 9243, 9810}, "indices of K0S positive daughters, for debug"};
-  Configurable<std::vector<int>> indexK0Sneg{"indexK0Sneg", {730, 2867, 4755, 5458, 6892, 7825, 9244, 9811}, "indices of K0S negative daughters, for debug"};
-  Configurable<std::vector<int>> indexProton{"indexProton", {717, 2810, 4393, 5442, 6769, 7793, 9002, 9789}, "indices of protons, for debug"};
-#endif
-
   using MyTracksWMc = soa::Join<aod::TracksWCov, aod::McTrackLabels>;
 
   void processMc(MyTracksWMc const& tracks,
@@ -293,24 +247,12 @@ struct HfCandidateCreatorCascadeMc {
       LOG(debug) << "\n";
       LOG(debug) << "Checking MC for candidate!";
       LOG(debug) << "Looking for K0s";
-#ifdef MY_DEBUG
-      auto indexV0DaughPos = trackV0DaughPos.mcParticleId();
-      auto indexV0DaughNeg = trackV0DaughNeg.mcParticleId();
-      auto indexBach = bach.mcParticleId();
-      bool isLc = isLcK0SpFunc(indexBach, indexV0DaughPos, indexV0DaughNeg, indexProton, indexK0Spos, indexK0Sneg);
-      bool isK0SfromLc = isK0SfromLcFunc(indexV0DaughPos, indexV0DaughNeg, indexK0Spos, indexK0Sneg);
-#endif
-      MY_DEBUG_MSG(isK0SfromLc, LOG(info) << "correct K0S in the Lc daughters: posTrack --> " << indexV0DaughPos << ", negTrack --> " << indexV0DaughNeg);
 
       // if (isLc) {
       RecoDecay::getMatchedMCRec(mcParticles, arrayDaughtersV0, kK0Short, std::array{+kPiPlus, -kPiPlus}, false, &sign, 1);
-
       if (sign != 0) { // we have already positively checked the K0s
         // then we check the Lc
-        MY_DEBUG_MSG(sign, LOG(info) << "K0S was correct! now we check the Lc");
-        MY_DEBUG_MSG(sign, LOG(info) << "index proton = " << indexBach);
         indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughtersLc, pdg::Code::kLambdaCPlus, std::array{+kProton, +kPiPlus, -kPiPlus}, true, &sign, 3); // 3-levels Lc --> p + K0 --> p + K0s --> p + pi+ pi-
-        MY_DEBUG_MSG(sign, LOG(info) << "Lc found with sign " << sign; printf("\n"));
       }
 
       // Check whether the particle is non-prompt (from a b quark).
@@ -333,7 +275,6 @@ struct HfCandidateCreatorCascadeMc {
         sign = -sign;
       }
       if (sign != 0) {
-        MY_DEBUG_MSG(sign, LOG(info) << "Lc in K0S p");
         arrDaughLcIndex.clear();
         // checking that the final daughters (decay depth = 3) are p, pi+, pi-
         RecoDecay::getDaughters(particle, &arrDaughLcIndex, arrDaughLcPDGRef, 3); // best would be to check the K0S daughters
@@ -347,7 +288,6 @@ struct HfCandidateCreatorCascadeMc {
           } else {
             LOG(debug) << "Lc --> K0S+p found in MC table";
           }
-          MY_DEBUG_MSG(sign == 0, LOG(info) << "Pity, the three final daughters are not p, pi+, pi-, but " << arrDaughLcPDG[0] << ", " << arrDaughLcPDG[1] << ", " << arrDaughLcPDG[2]);
         }
       }
       // Check whether the particle is non-prompt (from a b quark).

diff --git a/PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx b/PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx
@@ -25,7 +25,6 @@
 #include "PWGHF/Core/HfMlResponse.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGHF/Utils/utilsDebugLcToK0sP.h"
 
 using namespace o2;
 using namespace o2::analysis;