Merge branch 'AliceO2Group:master' into master

Author: arvindkhuntia

PWGCF/Femto/Core/collisionTagger.h

@@ -75,7 +75,7 @@ struct TrackSelectionValues {
 // V0-specific: MAKE_CASCADE_PARTITION, MAKE_SIGMA_PARTITION, MAKE_SIGMAPLUS_PARTITION,
 // MAKE_D0_PARTITION, and MAKE_CHARM3PRONG_PARTITION in Core/partitions.h are all byte-for-byte
 // identical to MAKE_LAMBDA_PARTITION, and CascadeMaskType/KinkMaskType/CharmHadronMaskType are
-// all, like V0MaskType, uint32_t -- so this one struct (and lambdaPasses()/readV0Selection()
+// all, like V0MaskType, uint32_t -- so this one struct (and signedV0Passes()/readV0Selection()
 // below) is reused verbatim for Xi/Omega (cascade), Sigma/SigmaPlus (kink), and D0/Lc
 // (charm hadron) selections too, not just Lambda. Only SigmaPlusPcm needs its own struct
 // (KinkPcmSelectionValues below), for the one extra mlScoreMin field it has beyond this shape.
@@ -506,7 +506,7 @@ bool trackPasses(T const& track, TrackSelectionValues const& sel)
 // as-is for Xi/Omega, Sigma/SigmaPlus, and D0/Lc candidates too (see the comment on
 // V0SelectionValues above).
 template <typename T>
-bool lambdaPasses(T const& v0, V0SelectionValues const& sel)
+bool signedV0Passes(T const& v0, V0SelectionValues const& sel)
 {
   if (sel.sign != 0 && ((sel.sign > 0) != (v0.signedPt() > 0.f))) {
     return false;
@@ -527,7 +527,7 @@ bool lambdaPasses(T const& v0, V0SelectionValues const& sel)
   return (v0.mask() & sel.mask) == sel.mask;
 }
 
-// mirrors MAKE_SIGMAPLUSPCM_PARTITION(selection) in Core/partitions.h -- lambdaPasses() above
+// mirrors MAKE_SIGMAPLUSPCM_PARTITION(selection) in Core/partitions.h -- signedV0Passes() above
 // plus the one extra mlScoreMin check.
 template <typename T>
 bool kinkPcmPasses(T const& kink, KinkPcmSelectionValues const& sel)
@@ -654,7 +654,7 @@ using CollisionTagBitset = std::bitset<MaxTagBits>;
 
 // true if at least `needed` entries in `range` satisfy `passes(entry, sel)`. The one primitive
 // every per-collision tagging check below is built from; a new particle type only ever needs a
-// new `passes` function (trackPasses/lambdaPasses/k0shortPasses above are examples), never a new
+// new `passes` function (trackPasses/signedV0Passes/k0shortPasses above are examples), never a new
 // copy of this loop.
 template <typename Range, typename Selection, typename PassesFn>
 inline bool hasAtLeast(Range const& range, Selection const& sel, PassesFn const& passes, int needed = 1)

PWGCF/Femto/TableProducer/femtoProducerCollisionTagger.cxx

@@ -246,8 +246,10 @@ class V0PhotonCut : public TNamed
       fRegistry->add("QA/V0Photon/before/hConvZR", "Conversion point ZR", o2::framework::HistType::kTH2F, {thAxisConvZ, thAxisConvR}, true);
       fRegistry->add("QA/V0Photon/before/hChi2", "Chi2/ndf from KFParticle;#chi^{2}_{KF}/ndf;counts", o2::framework::HistType::kTH1D, {thAxisChi2}, true);
 
-      // TODO: add psi_pair once available
-      // fRegistry->add("QA/V0Photon/before/hPsiPair", "Psi pair;#Psi_{pair};counts", o2::framework::HistType::kTH1D, {thAxisPsiPair}, true);
+      // psi_pair (V0PhotonsPhiVPsi) and the KF chi2 split (V0PhotonsKFChi2), filled only if the photon table joins them
+      fRegistry->add("QA/V0Photon/before/hPsiPair", "Psi pair;#Psi_{pair};counts", o2::framework::HistType::kTH1D, {thAxisPsiPair}, true);
+      fRegistry->add("QA/V0Photon/before/hChi2Vtx", "KF chi2/ndf of the conversion-vertex fit;#chi^{2}_{vtx}/ndf;counts", o2::framework::HistType::kTH1D, {thAxisChi2}, true);
+      fRegistry->add("QA/V0Photon/before/hChi2PV", "KF chi2 to the primary vertex;#chi^{2}_{PV};counts", o2::framework::HistType::kTH1D, {{100, 0., 200.}}, true);
 
       fRegistry->add("QA/V0Photon/before/Pos/NSigmaE", "NSigmaE of pos leg vs momentum", o2::framework::HistType::kTH2F, {thAxisMomentum, thAxisNSigmaE}, true);
       fRegistry->add("QA/V0Photon/before/Pos/NSigmaPi", "NSigmaE of pos leg vs momentum", o2::framework::HistType::kTH2F, {thAxisMomentum, thAxisNSigmaPi}, true);
@@ -316,8 +318,13 @@ class V0PhotonCut : public TNamed
     fRegistry->fill(HIST("QA/V0Photon/before/hConvZR"), v0.vz(), v0.v0radius());
     fRegistry->fill(HIST("QA/V0Photon/before/hChi2"), v0.chiSquareNDF());
 
-    // TODO: add psi_pair once available
-    // fRegistry->fill(HIST("QA/V0Photon/before/hPsiPair"), v0.psiPair());
+    if constexpr (requires { v0.psipair(); }) {
+      fRegistry->fill(HIST("QA/V0Photon/before/hPsiPair"), v0.psipair());
+    }
+    if constexpr (requires { v0.chi2PV(); }) {
+      fRegistry->fill(HIST("QA/V0Photon/before/hChi2Vtx"), v0.chi2NDFVtx());
+      fRegistry->fill(HIST("QA/V0Photon/before/hChi2PV"), v0.chi2PV());
+    }
 
     fRegistry->fill(HIST("QA/V0Photon/before/Pos/NSigmaE"), pos.p(), pos.tpcNSigmaEl());
     fRegistry->fill(HIST("QA/V0Photon/before/Pos/NSigmaPi"), pos.p(), pos.tpcNSigmaPi());
@@ -346,8 +353,13 @@ class V0PhotonCut : public TNamed
     fRegistry->fill(HIST("QA/V0Photon/after/hConvZR"), v0.vz(), v0.v0radius());
     fRegistry->fill(HIST("QA/V0Photon/after/hChi2"), v0.chiSquareNDF());
 
-    // TODO: add psi_pair once available
-    // fRegistry->fill(HIST("QA/V0Photon/after/hPsiPair"), v0.psiPair());
+    if constexpr (requires { v0.psipair(); }) {
+      fRegistry->fill(HIST("QA/V0Photon/after/hPsiPair"), v0.psipair());
+    }
+    if constexpr (requires { v0.chi2PV(); }) {
+      fRegistry->fill(HIST("QA/V0Photon/after/hChi2Vtx"), v0.chi2NDFVtx());
+      fRegistry->fill(HIST("QA/V0Photon/after/hChi2PV"), v0.chi2PV());
+    }
 
     fRegistry->fill(HIST("QA/V0Photon/after/Pos/NSigmaE"), pos.p(), pos.tpcNSigmaEl());
     fRegistry->fill(HIST("QA/V0Photon/after/Pos/NSigmaPi"), pos.p(), pos.tpcNSigmaPi());