Refactor trigger names and update SigmaC checks

Author: singhra1994

EventFiltering/PWGHF/HFFilterHelpers.h

@@ -30,13 +30,14 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-
 #include "ReconstructionDataFormats/PID.h"
+
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/MathConstants.h>
 #include <CommonConstants/PhysicsConstants.h>
 #include <DCAFitter/DCAFitterN.h>
+#include <MathUtils/BetheBlochAleph.h>
 #include <DetectorsBase/Propagator.h>
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
@@ -45,7 +46,6 @@
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
 #include <Framework/Logger.h>
-#include <MathUtils/BetheBlochAleph.h>
 
 #include <Math/GenVector/Boost.h>
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
@@ -100,7 +100,7 @@ enum HfTriggers {
   kBtoJPsiPhi,
   kBtoJPsiPrKa,
   kBtoJPsiPi,
-  kSigmaCP,
+  kSigmaCPr,
   kNtriggersHF
 };
 
@@ -249,7 +249,7 @@ static const int nTotBeautyParts = static_cast<int>(kNBeautyParticles) + static_
 static const std::array<std::string, nTotBeautyParts> beautyParticleNames{"Bplus", "B0toDStar", "Bc", "B0", "Bs", "Lb", "Xib", "BplusToJPsi", "B0ToJPsi", "BsToJPsi", "LbToJPsi", "BcToJPsi"};
 static const std::array<int, kNCharmParticles> pdgCodesCharm{421, 411, 431, 4122, 4232};
 static const std::array<std::string, 2> eventTitles = {"all", "rejected"};
-static const std::vector<std::string> hfTriggerNames{filtering::HfHighPt2P::columnLabel(), filtering::HfHighPt3P::columnLabel(), filtering::HfBeauty3P::columnLabel(), filtering::HfBeauty4P::columnLabel(), filtering::HfFemto2P::columnLabel(), filtering::HfFemto3P::columnLabel(), filtering::HfDoubleCharm2P::columnLabel(), filtering::HfDoubleCharm3P::columnLabel(), filtering::HfDoubleCharmMix::columnLabel(), filtering::HfV0Charm2P::columnLabel(), filtering::HfV0Charm3P::columnLabel(), filtering::HfCharmBarToXiBach::columnLabel(), filtering::HfSigmaCPPK::columnLabel(), filtering::HfSigmaC0K0::columnLabel(), filtering::HfPhotonCharm2P::columnLabel(), filtering::HfPhotonCharm3P::columnLabel(), filtering::HfSingleCharm2P::columnLabel(), filtering::HfSingleCharm3P::columnLabel(), filtering::HfSingleNonPromptCharm2P::columnLabel(), filtering::HfSingleNonPromptCharm3P::columnLabel(), filtering::HfCharmBarToXi2Bach::columnLabel(), filtering::HfPrCharm2P::columnLabel(), filtering::HfBtoJPsiKa::columnLabel(), filtering::HfBtoJPsiKstar::columnLabel(), filtering::HfBtoJPsiPhi::columnLabel(), filtering::HfBtoJPsiPrKa::columnLabel(), filtering::HfBtoJPsiPi::columnLabel(), filtering::HfSigmaCP::columnLabel()};
+static const std::vector<std::string> hfTriggerNames{filtering::HfHighPt2P::columnLabel(), filtering::HfHighPt3P::columnLabel(), filtering::HfBeauty3P::columnLabel(), filtering::HfBeauty4P::columnLabel(), filtering::HfFemto2P::columnLabel(), filtering::HfFemto3P::columnLabel(), filtering::HfDoubleCharm2P::columnLabel(), filtering::HfDoubleCharm3P::columnLabel(), filtering::HfDoubleCharmMix::columnLabel(), filtering::HfV0Charm2P::columnLabel(), filtering::HfV0Charm3P::columnLabel(), filtering::HfCharmBarToXiBach::columnLabel(), filtering::HfSigmaCPPK::columnLabel(), filtering::HfSigmaC0K0::columnLabel(), filtering::HfPhotonCharm2P::columnLabel(), filtering::HfPhotonCharm3P::columnLabel(), filtering::HfSingleCharm2P::columnLabel(), filtering::HfSingleCharm3P::columnLabel(), filtering::HfSingleNonPromptCharm2P::columnLabel(), filtering::HfSingleNonPromptCharm3P::columnLabel(), filtering::HfCharmBarToXi2Bach::columnLabel(), filtering::HfPrCharm2P::columnLabel(), filtering::HfBtoJPsiKa::columnLabel(), filtering::HfBtoJPsiKstar::columnLabel(), filtering::HfBtoJPsiPhi::columnLabel(), filtering::HfBtoJPsiPrKa::columnLabel(), filtering::HfBtoJPsiPi::columnLabel(), filtering::HfSigmaCPr::columnLabel()};
 
 static const std::array<std::string, kNV0> v0Labels{"#gamma", "K_{S}^{0}", "#Lambda", "#bar{#Lambda}"};
 static const std::array<std::string, kNV0> v0Names{"Photon", "K0S", "Lambda", "AntiLambda"};
@@ -875,7 +875,7 @@ inline int16_t HfFilterHelper::isSelectedTrackForSoftPionOrBeauty(const T& track
     return kRejected;
   }
 
-  if constexpr (whichTrigger == kSigmaCPPK || whichTrigger == kSigmaC0K0 || whichTrigger == kSigmaCP) {
+  if constexpr (whichTrigger == kSigmaCPPK || whichTrigger == kSigmaC0K0 || whichTrigger == kSigmaCPr) {
 
     // SigmaC0,++ soft pion pt cut
     if (pT < mPtMinSoftPionForSigmaC || pT > mPtMaxSoftPionForSigmaC) {
@@ -941,7 +941,7 @@ inline int16_t HfFilterHelper::isSelectedTrackForSoftPionOrBeauty(const T& track
 /// \return true if track passes all cuts
 template <typename Atrack, typename SpeciesContainer, typename T1, typename T2>
 inline bool HfFilterHelper::isSelectedTrack4Corr(Atrack const& track, SpeciesContainer const mPIDspecies,
-                                                 T1 const maxTPC, T2 const maxTOF, float minPt, float maxPt, float ptThreshold, bool tofForced)
+                      T1 const maxTPC, T2 const maxTOF, float minPt, float maxPt, float ptThreshold, bool tofForced)
 {
   // Ensure size consistency
   if (mPIDspecies.value.size() != maxTPC.value.size() || mPIDspecies.value.size() != maxTOF.value.size()) {
@@ -953,19 +953,19 @@ inline bool HfFilterHelper::isSelectedTrack4Corr(Atrack const& track, SpeciesCon
     return false;
   }
 
-  if (track.pt() < minPt || track.pt() > maxPt) {
+  if (track.pt() < minPt || track.pt() > maxPt){
     return false;
   }
 
   for (size_t speciesIndex = 0; speciesIndex < mPIDspecies.value.size(); ++speciesIndex) {
     float nSigmaTPC;
     auto const& pid = mPIDspecies->at(speciesIndex);
-
+    
     nSigmaTPC = o2::aod::pidutils::tpcNSigma(pid, track);
 
     if (track.pt() > ptThreshold && tofForced && !track.hasTOF())
       return false;
-
+    
     int parSpecies = -1;
     float tpcNCls = track.tpcNClsFound();
     float tpcPin = track.tpcInnerParam();
@@ -980,12 +980,13 @@ inline bool HfFilterHelper::isSelectedTrack4Corr(Atrack const& track, SpeciesCon
     } else {
       LOGF(fatal, "particle species is not defined in isSelectedTrack4Corr");
     }
-
+    
     // 2. Apply nSigmaTPC using selected calibration
     if (mTpcPidCalibrationOption == 1) {
       // Option 1: post-calibration → no sign dependence
       nSigmaTPC = getTPCPostCalib(tpcPin, tpcNCls, eta, nSigmaTPC, parSpecies);
-    }
+    
+    } 
     if (mTpcPidCalibrationOption == 2) {
       float dEdx = track.tpcSignal();
       // Option 2: spline calibration → charge-dependent
@@ -995,14 +996,14 @@ inline bool HfFilterHelper::isSelectedTrack4Corr(Atrack const& track, SpeciesCon
       } else {
         // Negative track
         if (pid == o2::track::PID::Proton) {
-          parSpecies = kAntiPr;
-        } else if (pid == o2::track::PID::Kaon) {
-          parSpecies = kAntiKa;
-        } else if (pid == o2::track::PID::Pion) {
-          parSpecies = kAntiPi;
-        } else {
-          LOGF(fatal, "particle species is not defined in isSelectedTrack4Corr");
-        }
+           parSpecies = kAntiPr;
+         } else if (pid == o2::track::PID::Kaon) {
+           parSpecies = kAntiKa;
+         } else if (pid == o2::track::PID::Pion) {
+           parSpecies = kAntiPi;
+         } else {
+           LOGF(fatal, "particle species is not defined in isSelectedTrack4Corr");
+         }
         nSigmaTPC = getTPCSplineCalib(tpcPin, dEdx, parSpecies);
       }
     }
@@ -1034,6 +1035,8 @@ inline bool HfFilterHelper::isSelectedTrack4Corr(Atrack const& track, SpeciesCon
   return true; // Passed all checks
 }
 
+
+
 /// Basic selection of proton or deuteron candidates
 /// \param track is a track
 /// \param trackPar is a track parameter
@@ -1428,7 +1431,7 @@ inline int8_t HfFilterHelper::isSelectedLcInMassRange(const T& pTrackSameChargeF
 template <typename T, typename H2>
 inline bool HfFilterHelper::selectionSigmaCForScPCorr(const T& pTrackSameChargeFirst, const T& pTrackSameChargeSecond, const T& pTrackOppositeCharge, const T& pTrackSoftPi, const float ptSigmaC, const int8_t isSelectedLc, H2 hMassVsPt, const int& activateQA, float mDeltaMassMinSigmaC, float mDeltaMassMaxSigmaC, float mPtMinSigmaC, float mPtMaxSigmaC)
 {
-  if (ptSigmaC < mPtMinSigmaC || ptSigmaC > mPtMaxSigmaC) {
+  if (ptSigmaC < mPtMinSigmaC || ptSigmaC > mPtMaxSigmaC){
     return false;
   }
   bool isSigmaCSelected{false};
@@ -1439,12 +1442,13 @@ inline bool HfFilterHelper::selectionSigmaCForScPCorr(const T& pTrackSameChargeF
     float invMassSigmaCToLcPKPi = RecoDecay::m(std::array{pTrackSameChargeFirst, pTrackOppositeCharge, pTrackSameChargeSecond, pTrackSoftPi}, massDausSigmaCToLcPKPi);
     float deltaMassPKPi = invMassSigmaCToLcPKPi - invMassLcToPKPi;
     isSigmaCSelected = (mDeltaMassMinSigmaC < deltaMassPKPi && deltaMassPKPi < mDeltaMassMaxSigmaC);
-    if (isSigmaCSelected) {
-      if (activateQA) {
-        hMassVsPt->Fill(ptSigmaC, deltaMassPKPi);
-      }
+    if(isSigmaCSelected){
+      if (activateQA){
+      hMassVsPt->Fill(ptSigmaC, deltaMassPKPi);
+    }
       return true;
     }
+
   }
   if (TESTBIT(isSelectedLc, 1)) {
     /// Lc->piKp case
@@ -1454,18 +1458,21 @@ inline bool HfFilterHelper::selectionSigmaCForScPCorr(const T& pTrackSameChargeF
     float deltaMassPiKP = invMassSigmaCToLcPiKP - invMassLcToPiKP;
 
     isSigmaCSelected = (mDeltaMassMinSigmaC < deltaMassPiKP && deltaMassPiKP < mDeltaMassMaxSigmaC);
-    if (isSigmaCSelected) {
-      if (activateQA) {
-        hMassVsPt->Fill(ptSigmaC, deltaMassPiKP);
-      }
+    if(isSigmaCSelected){
+      if (activateQA){
+      hMassVsPt->Fill(ptSigmaC, deltaMassPiKP);
+    }
       return true;
     }
+    
   }
 
   return isSigmaCSelected;
   /// TODO: add QA plot
 }
 
+
+
 /// Delta mass selection on SigmaC candidates
 template <int charge, typename T, typename H2>
 inline int8_t HfFilterHelper::isSelectedSigmaCInDeltaMassRange(const T& pTrackSameChargeFirst, const T& pTrackSameChargeSecond, const T& pTrackOppositeCharge, const T& pTrackSoftPi, const float ptSigmaC, const int8_t isSelectedLc, H2 hMassVsPt, const int& activateQA)