From d4ccc753a50b8a7657607738ccf2bd169b8a388e Mon Sep 17 00:00:00 2001
From: ariedel-cern <85537041+ariedel-cern@users.noreply.github.com>
Date: Thu, 11 Jan 2024 20:23:08 +0100
Subject: [PATCH 1/2] PWGCF: trigger update (#4279)

* Feat: use recalculated DCA to PV for V0 daughters

* Feat: use track variables from v0 table

* Fix: fix linter issues
---
 EventFiltering/PWGCF/CFFilterAll.cxx | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/EventFiltering/PWGCF/CFFilterAll.cxx b/EventFiltering/PWGCF/CFFilterAll.cxx
index 6e0147621f1..fb719a02bcf 100644
--- a/EventFiltering/PWGCF/CFFilterAll.cxx
+++ b/EventFiltering/PWGCF/CFFilterAll.cxx
@@ -929,12 +929,19 @@ struct CFFilter {
     return true;
   }
 
-  template <typename T>
-  bool isSelectedV0Daughter(T const& track, float charge, CFTrigger::V0Daughters species, double nSigmaTPCDaug[2])
+  template <typename T, typename V>
+  bool isSelectedV0Daughter(T const& track, V const& v0, float charge, CFTrigger::V0Daughters species, double nSigmaTPCDaug[2])
   {
-    const auto eta = track.eta();
     const auto tpcNClsF = track.tpcNClsFound();
-    const auto dcaXY = track.dcaXY();
+    float eta = -1;
+    float dca = -1;
+    if (charge > 0) {
+      eta = v0.positiveeta();
+      dca = v0.dcapostopv();
+    } else if (charge < 0) {
+      eta = v0.negativeeta();
+      dca = v0.dcanegtopv();
+    }
     const auto sign = track.sign();
     double nSigmaTPC = -999.f;
 
@@ -950,7 +957,7 @@ struct CFFilter {
     if (tpcNClsF < ConfDaughTPCnclsMin) {
       return false;
     }
-    if (std::abs(dcaXY) < ConfDaughDCAMin) {
+    if (std::abs(dca) < ConfDaughDCAMin) {
       return false;
     }
 
@@ -1143,18 +1150,18 @@ struct CFFilter {
       }
     }
     if (charge > 0) {
-      if (!isSelectedV0Daughter(posTrack, 1, CFTrigger::kDaughProton, nSigmaTPCPos)) {
+      if (!isSelectedV0Daughter(posTrack, v0, 1, CFTrigger::kDaughProton, nSigmaTPCPos)) {
         return false;
       }
-      if (!isSelectedV0Daughter(negTrack, -1, CFTrigger::kDaughPion, nSigmaTPCNeg)) {
+      if (!isSelectedV0Daughter(negTrack, v0, -1, CFTrigger::kDaughPion, nSigmaTPCNeg)) {
         return false;
       }
     }
     if (charge < 0) {
-      if (!isSelectedV0Daughter(posTrack, 1, CFTrigger::kDaughPion, nSigmaTPCPos)) {
+      if (!isSelectedV0Daughter(posTrack, v0, 1, CFTrigger::kDaughPion, nSigmaTPCPos)) {
         return false;
       }
-      if (!isSelectedV0Daughter(negTrack, -1, CFTrigger::kDaughProton, nSigmaTPCNeg)) {
+      if (!isSelectedV0Daughter(negTrack, v0, -1, CFTrigger::kDaughProton, nSigmaTPCNeg)) {
         return false;
       }
     }

From 65027f0a50c2f384215dc959a92c0f293c81a099 Mon Sep 17 00:00:00 2001
From: ALICE Action Bot <alibuild@cern.ch>
Date: Thu, 11 Jan 2024 20:20:19 +0000
Subject: [PATCH 2/2] MegaLinter fixes

---
 DPG/Tasks/AOTTrack/tagAndProbeDmesons.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DPG/Tasks/AOTTrack/tagAndProbeDmesons.cxx b/DPG/Tasks/AOTTrack/tagAndProbeDmesons.cxx
index 7b7efc8d2ac..8e048bce237 100644
--- a/DPG/Tasks/AOTTrack/tagAndProbeDmesons.cxx
+++ b/DPG/Tasks/AOTTrack/tagAndProbeDmesons.cxx
@@ -697,14 +697,14 @@ struct ProbeThirdTrack {
       // D*+ -> D0(->pi+K-)pi+
       auto groupedTagsPiKa = tagsPiKa.sliceBy(tagsPiKaPerCollision, thisCollId);
       for (const auto& tagPiKa : groupedTagsPiKa) {
-        auto trackFirst = tagPiKa.track0_as<TracksWithDca>(); // positive --> pion
+        auto trackFirst = tagPiKa.track0_as<TracksWithDca>();  // positive --> pion
         auto trackSecond = tagPiKa.track1_as<TracksWithDca>(); // negative --> kaon
         loopOverThirdTrack(groupedTrackIndices, tracks, trackFirst, trackSecond, aod::tagandprobe::TagChannels::DstarPlusToDzeroPi);
       }
       // D*- -> D0bar(->K+pi-)pi-
       auto groupedTagsKaPi = tagsKaPi.sliceBy(tagsKaPiPerCollision, thisCollId);
       for (const auto& tagKaPi : groupedTagsKaPi) {
-        auto trackFirst = tagKaPi.track0_as<TracksWithDca>(); // positive --> kaon
+        auto trackFirst = tagKaPi.track0_as<TracksWithDca>();  // positive --> kaon
         auto trackSecond = tagKaPi.track1_as<TracksWithDca>(); // negative --> pion
         loopOverThirdTrack(groupedTrackIndices, tracks, trackFirst, trackSecond, aod::tagandprobe::TagChannels::DstarMinusToDzeroBarPi);
       }