mv isTrackSelected to utils; make tsalisCharged lambda

Author: lubynets

DPG/Tasks/TPC/tpcSkimsTableCreator.cxx

@@ -129,13 +129,6 @@ struct TreeWriterTpcV0 {
     DaughterProton
   };
 
-  Filter trackFilter = (trackSelection.node() == static_cast<int>(TrackSelectionNoCut)) ||
-                       ((trackSelection.node() == static_cast<int>(TrackSelectionGlobalTrack)) && requireGlobalTrackInFilter()) ||
-                       ((trackSelection.node() == static_cast<int>(TrackSelectionTrackWoPtEta)) && requireGlobalTrackWoPtEtaInFilter()) ||
-                       ((trackSelection.node() == static_cast<int>(TrackSelectionGlobalTrackWoDCA)) && requireGlobalTrackWoDCAInFilter()) ||
-                       ((trackSelection.node() == static_cast<int>(TrackSelectionQualityTracks)) && requireQualityTracksInFilter()) ||
-                       ((trackSelection.node() == static_cast<int>(TrackSelectionInAcceptanceTracks)) && requireTrackCutInFilter(TrackSelectionFlags::kInAcceptanceTracks));
-
   ctpRateFetcher mRateFetcher;
 
   struct V0Daughter {
@@ -465,6 +458,9 @@ struct TreeWriterTpcV0 {
       }
       const auto& posTrack = v0.posTrack_as<soa::Filtered<TrksType>>();
       const auto& negTrack = v0.negTrack_as<soa::Filtered<TrksType>>();
+      if (!(isTrackSelected(posTrack, trackSelection) && isTrackSelected(negTrack, trackSelection))) {
+        continue;
+      }
 
       const V0Mother v0Mother = createV0Mother(v0Id);
       const V0Daughter posDaughter = createV0Daughter<IsCorrectedDeDx>(v0, posTrack, v0Id, v0Mother.posDaughterId, true);
@@ -481,6 +477,9 @@ struct TreeWriterTpcV0 {
         continue;
       }
       const auto& bachTrack = casc.bachelor_as<soa::Filtered<TrksType>>();
+      if (!isTrackSelected(bachTrack, trackSelection)) {
+        continue;
+      }
       const V0Daughter bachDaughter = createV0Daughter<IsCorrectedDeDx>(casc, bachTrack, cascId, DaughterKaon);
       // Omega and antiomega
       fillDaughterTrack(casc, bachTrack, bachDaughter);
@@ -566,6 +565,9 @@ struct TreeWriterTpcV0 {
         }
         const auto& posTrack = v0.posTrack_as<TrksType>();
         const auto& negTrack = v0.negTrack_as<TrksType>();
+        if (!(isTrackSelected(posTrack, trackSelection) && isTrackSelected(negTrack, trackSelection))) {
+          continue;
+        }
 
         const auto& [posTrackQA, existPosTrkQA] = getTrackQA(posTrack);
         const auto& [negTrackQA, existNegTrkQA] = getTrackQA(negTrack);
@@ -585,6 +587,9 @@ struct TreeWriterTpcV0 {
           continue;
         }
         const auto& bachTrack = casc.bachelor_as<TrksType>();
+        if (!isTrackSelected(bachTrack, trackSelection)) {
+          continue;
+        }
         const V0Daughter bachDaughter = createV0Daughter<IsCorrectedDeDx>(casc, bachTrack, cascId, DaughterKaon);
         const auto& [bachTrackQA, existBachTrkQA] = getTrackQA(bachTrack);
         // Omega and antiomega
@@ -962,12 +967,7 @@ struct TreeWriterTPCTOF {
       }
       rowTPCTOFTreeWithTrkQA.reserve(tracks.size());
       for (auto const& trk : tracksWithITSPid) {
-        if (!((trackSelection == TrackSelectionNoCut) ||
-              ((trackSelection == TrackSelectionGlobalTrack) && trk.isGlobalTrack()) ||
-              ((trackSelection == TrackSelectionTrackWoPtEta) && trk.isGlobalTrackWoPtEta()) ||
-              ((trackSelection == TrackSelectionGlobalTrackWoDCA) && trk.isGlobalTrackWoDCA()) ||
-              ((trackSelection == TrackSelectionQualityTracks) && trk.isQualityTrack()) ||
-              ((trackSelection == TrackSelectionInAcceptanceTracks) && trk.isInAcceptanceTrack()))) {
+        if (!isTrackSelected(trk, trackSelection)) {
           continue;
         }
         // get the corresponding trackQA using labelTracks2TracKQA and get variables of interest

DPG/Tasks/TPC/utilsTpcSkimsTableCreator.h

@@ -55,18 +55,6 @@ inline bool isEventSelected(const CollisionType& collision, const int applyEvSel
   return true;
 };
 
-inline double tsalisCharged(const double pt, const double mass, const double sqrtSNN)
-{
-  const double a = 6.81, b = 59.24;
-  const double c = 0.082, d = 0.151;
-  const double mt = std::sqrt(mass * mass + pt * pt);
-  const double n = a + b / sqrtSNN;
-  const double t = c + d / sqrtSNN;
-  const double p0 = n * t;
-  const double result = std::pow((1. + mt / p0), -n);
-  return result;
-};
-
 /// Random downsampling trigger function using Tsalis/Hagedorn spectra fit (sqrt(s) = 62.4 GeV to 13 TeV)
 /// as in https://iopscience.iop.org/article/10.1088/2399-6528/aab00f/pdf
 inline bool downsampleTsalisCharged(TRandom3* fRndm, const double pt, const double factor1Pt, const double mass, const double sqrtSNN, const double maxPt = 1e9)
@@ -75,14 +63,40 @@ inline bool downsampleTsalisCharged(TRandom3* fRndm, const double pt, const doub
     return true;
   }
 
-  const double prob = tsalisCharged(pt, mass, sqrtSNN) * pt;
-  const double probNorm = tsalisCharged(1., mass, sqrtSNN);
+  auto tsalisCharged = [&](const double pT) {
+    const double a = 6.81, b = 59.24;
+    const double c = 0.082, d = 0.151;
+    const double mt = std::sqrt(mass * mass + pT * pT);
+    const double n = a + b / sqrtSNN;
+    const double t = c + d / sqrtSNN;
+    const double p0 = n * t;
+    const double result = std::pow((1. + mt / p0), -n);
+    return result;
+  };
+
+  const double prob = tsalisCharged(pt) * pt;
+  const double probNorm = tsalisCharged(1.);
   if ((fRndm->Rndm() * ((prob / probNorm) * pt * pt)) > factor1Pt) {
     return false;
   } else {
     return true;
   }
 };
 
+// Track selection
+template <typename TrackType>
+inline bool isTrackSelected(const TrackType& track, const int trackSelection)
+{
+  bool isSelected{false};
+  isSelected |= trackSelection == TrackSelectionNoCut;
+  isSelected |= (trackSelection == TrackSelectionGlobalTrack) && track.isGlobalTrack();
+  isSelected |= (trackSelection == TrackSelectionTrackWoPtEta) && track.isGlobalTrackWoPtEta();
+  isSelected |= (trackSelection == TrackSelectionGlobalTrackWoDCA) && track.isGlobalTrackWoDCA();
+  isSelected |= (trackSelection == TrackSelectionQualityTracks) && track.isQualityTrack();
+  isSelected |= (trackSelection == TrackSelectionInAcceptanceTracks) && track.isInAcceptanceTrack();
+
+  return isSelected;
+}
+
 } // namespace o2::dpg_tpcskimstablecreator
 #endif // DPG_TASKS_TPC_UTILSTPCSKIMSTABLECREATOR_H_