Fix: Use epsilon and reco decay + add PhiAtPv in KinkFilters

Author: Henrik Fribert

PWGCF/Femto/Core/femtoUtils.h

@@ -16,6 +16,7 @@
 #ifndef PWGCF_FEMTO_CORE_FEMTOUTILS_H_
 #define PWGCF_FEMTO_CORE_FEMTOUTILS_H_
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TableHelper.h"
 
 #include <CommonConstants/MathConstants.h>
@@ -180,15 +181,10 @@ concept HasEventShape = HasEventShapeRow<std::decay_t<T>> || (requires { typenam
 /// phiPV = 2*phiChord - phiDecay (independent of polarity).
 inline float phiAtPrimaryVertex(float phiDecay, float xDecay, float yDecay)
 {
-  constexpr float TwoPi = o2::constants::math::TwoPI;
-  if (xDecay == 0.f && yDecay == 0.f) {
+  if (std::abs(xDecay) < o2::constants::math::Epsilon && std::abs(yDecay) < o2::constants::math::Epsilon) {
     return phiDecay;
   }
-  float phi = std::fmod(2.f * std::atan2(yDecay, xDecay) - phiDecay, TwoPi);
-  if (phi < 0.f) {
-    phi += TwoPi;
-  }
-  return phi;
+  return RecoDecay::constrainAngle(2.f * std::atan2(yDecay, xDecay) - phiDecay);
 }
 
 /// Recalculate the pT of a kink mother from its direction and the charged daughter momentum

PWGCF/Femto/Core/kinkBuilder.h

@@ -235,6 +235,7 @@ enum KinkFilters {
   kPhiMax,
   kMassMin,
   kMassMax,
+  kPhiAtPv,
   kMlScoreMin,
   kKinkFiltersMax
 };
@@ -251,6 +252,7 @@ const std::unordered_map<KinkFilters, std::string> kinkFilterNames = {
   {kPhiMax, "phiMax"},
   {kMassMin, "massMin"},
   {kMassMax, "massMax"},
+  {kPhiAtPv, "kinkPhiAtPv"},
   {kMlScoreMin, "mlScoreMin"}};
 
 /// \class KinkCuts
@@ -319,6 +321,7 @@ class KinkSelection : public baseselection::BaseSelection<float, o2::analysis::f
           {kinkFilterNames.at(kPhiMax), mPhiMax},
           {kinkFilterNames.at(kMassMin), mMassSigmaLowerLimit},
           {kinkFilterNames.at(kMassMax), mMassSigmaUpperLimit},
+          {kinkFilterNames.at(kPhiAtPv), static_cast<float>(mKinkPhiAtPv)},
         });
     }
     if constexpr (modes::isEqual(kinkType, modes::Kink::kSigmaPlus)) {
@@ -333,6 +336,7 @@ class KinkSelection : public baseselection::BaseSelection<float, o2::analysis::f
           {kinkFilterNames.at(kPhiMax), mPhiMax},
           {kinkFilterNames.at(kMassMin), mMassSigmaPlusLowerLimit},
           {kinkFilterNames.at(kMassMax), mMassSigmaPlusUpperLimit},
+          {kinkFilterNames.at(kPhiAtPv), static_cast<float>(mKinkPhiAtPv)},
         });
     }
   };
@@ -473,6 +477,8 @@ class KinkSelection : public baseselection::BaseSelection<float, o2::analysis::f
     this->template fillFilter<FilterHistName>(kPhiMax, p);
     pass &= p;
 
+    this->template fillFilter<FilterHistName>(kPhiAtPv, mKinkPhiAtPv);
+
     if constexpr (modes::isEqual(kinkType, modes::Kink::kSigma)) {
       float sigmaMass = kinkCand.mSigmaMinus();
 
@@ -859,6 +865,7 @@ class SigmaPlusPcmSelection : public baseselection::BaseSelection<float, o2::ana
         {kinkFilterNames.at(kPhiMax), mPhiMax},
         {kinkFilterNames.at(kMassMin), mMassLowerLimit},
         {kinkFilterNames.at(kMassMax), mMassUpperLimit},
+        {kinkFilterNames.at(kPhiAtPv), static_cast<float>(mPhiAtPv)},
         {kinkFilterNames.at(kMlScoreMin), mMlScoreMin},
       });
   };
@@ -907,6 +914,8 @@ class SigmaPlusPcmSelection : public baseselection::BaseSelection<float, o2::ana
     this->template fillFilter<FilterHistName>(kPhiMax, p);
     pass &= p;
 
+    this->template fillFilter<FilterHistName>(kPhiAtPv, mPhiAtPv);
+
     p = mMass > mMassLowerLimit;
     this->template fillFilter<FilterHistName>(kMassMin, p);
     pass &= p;