added 'track-sorting' parameter (enabled by default) to drive sorting/not sorting tracks

jmyrcha · shahor02 · commit f3f44391b2ae · 2022-05-28T04:28:49.000+04:00
diff --git a/EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h b/EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h
@@ -138,7 +138,7 @@ class EveWorkflowHelper
   EveWorkflowHelper(const FilterSet& enabledFilters = {}, std::size_t maxNTracks = -1, const Bracket& timeBracket = {}, const Bracket& etaBracket = {});
   static std::vector<PNT> getTrackPoints(const o2::track::TrackPar& trc, float minR, float maxR, float maxStep, float minZ = -25000, float maxZ = 25000);
   void selectTracks(const CalibObjectsConst* calib, GID::mask_t maskCl,
-                    GID::mask_t maskTrk, GID::mask_t maskMatch);
+                    GID::mask_t maskTrk, GID::mask_t maskMatch, bool trackSorting);
   void addTrackToEvent(const o2::track::TrackParCov& tr, GID gid, float trackTime, float dz, GID::Source source = GID::NSources, float maxStep = 4.f);
   void draw();
   void drawTPC(GID gid, float trackTime);
diff --git a/EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h b/EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h
@@ -50,8 +50,11 @@ class O2DPLDisplaySpec : public o2::framework::Task
   O2DPLDisplaySpec(bool useMC, o2::dataformats::GlobalTrackID::mask_t trkMask,
                    o2::dataformats::GlobalTrackID::mask_t clMask,
                    std::shared_ptr<o2::globaltracking::DataRequest> dataRequest, const std::string& jsonPath,
-                   std::chrono::milliseconds timeInterval, int numberOfFiles, int numberOfTracks, bool eveHostNameMatch, int minITSTracks, int minTracks, bool filterITSROF, bool filterTime, const EveWorkflowHelper::Bracket& timeBracket, bool removeTPCEta, const EveWorkflowHelper::Bracket& etaBracket)
-    : mUseMC(useMC), mTrkMask(trkMask), mClMask(clMask), mDataRequest(dataRequest), mJsonPath(jsonPath), mTimeInterval(timeInterval), mNumberOfFiles(numberOfFiles), mNumberOfTracks(numberOfTracks), mEveHostNameMatch(eveHostNameMatch), mMinITSTracks(minITSTracks), mMinTracks(minTracks), mFilterITSROF(filterITSROF), mFilterTime(filterTime), mTimeBracket(timeBracket), mRemoveTPCEta(removeTPCEta), mEtaBracket(etaBracket)
+                   std::chrono::milliseconds timeInterval, int numberOfFiles, int numberOfTracks,
+                   bool eveHostNameMatch, int minITSTracks, int minTracks, bool filterITSROF, bool filterTime,
+                   const EveWorkflowHelper::Bracket& timeBracket, bool removeTPCEta,
+                   const EveWorkflowHelper::Bracket& etaBracket, bool trackSorting)
+    : mUseMC(useMC), mTrkMask(trkMask), mClMask(clMask), mDataRequest(dataRequest), mJsonPath(jsonPath), mTimeInterval(timeInterval), mNumberOfFiles(numberOfFiles), mNumberOfTracks(numberOfTracks), mEveHostNameMatch(eveHostNameMatch), mMinITSTracks(minITSTracks), mMinTracks(minTracks), mFilterITSROF(filterITSROF), mFilterTime(filterTime), mTimeBracket(timeBracket), mRemoveTPCEta(removeTPCEta), mEtaBracket(etaBracket), mTrackSorting(trackSorting)
   {
     this->mTimeStamp = std::chrono::high_resolution_clock::now() - timeInterval; // first run meets condition
   }
@@ -77,6 +80,7 @@ class O2DPLDisplaySpec : public o2::framework::Task
   std::chrono::milliseconds mTimeInterval;  // minimal interval between files in milliseconds
   int mNumberOfFiles;                       // maximum number of files in folder - newer replaces older
   int mNumberOfTracks;                      // maximum number of track in single file (0 means no limit)
+  bool mTrackSorting;                       // perform sorting tracks by track time before applying filters
   std::chrono::time_point<std::chrono::high_resolution_clock> mTimeStamp;
 
   o2::dataformats::GlobalTrackID::mask_t mTrkMask;
diff --git a/EventVisualisation/Workflow/src/EveWorkflowHelper.cxx b/EventVisualisation/Workflow/src/EveWorkflowHelper.cxx
@@ -33,16 +33,18 @@
 #include "PHOSBase/Geometry.h"
 #include <TGeoBBox.h>
 #include <tuple>
+#include <gsl/span>
 
 using namespace o2::event_visualisation;
 
+struct TrackTimeNode {
+  GID trackGID;
+  float trackTime;
+};
+
 void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
-                                     GID::mask_t maskCl, GID::mask_t maskTrk, GID::mask_t maskMatch)
+                                     GID::mask_t maskCl, GID::mask_t maskTrk, GID::mask_t maskMatch, bool trackSorting)
 {
-  struct TrackTimeNode {
-    GID trackGID;
-    float trackTime;
-  };
   std::vector<TrackTimeNode> trackTimeNodes;
   std::vector<Bracket> itsROFBrackets;
 
@@ -106,10 +108,6 @@ void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
       return true;
     }
 
-    if (mEnabledFilters.test(Filter::TotalNTracks) && mTrackSet.trackGID.size() >= mMaxNTracks) {
-      return true;
-    }
-
     auto bracket = correctTrackTime(trk, time, terr);
 
     if (mEnabledFilters.test(Filter::TimeBracket) && mTimeBracket.getOverlap(bracket).isInvalid()) {
@@ -120,9 +118,6 @@ void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
       return true;
     }
 
-    // mTrackSet.trackGID.push_back(gid);
-    // mTrackSet.trackTime.push_back(bracket.mean());
-
     TrackTimeNode node;
     node.trackGID = gid;
     node.trackTime = bracket.mean();
@@ -132,14 +127,20 @@ void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
   };
 
   this->mRecoCont.createTracksVariadic(creator);
-  std::sort(trackTimeNodes.begin(), trackTimeNodes.end(),
-            [](TrackTimeNode a, TrackTimeNode b) {
-              return a.trackTime > b.trackTime;
-            });
-  for (auto node : trackTimeNodes) {
-    if (mEnabledFilters.test(Filter::TotalNTracks) && mTrackSet.trackGID.size() >= mMaxNTracks) {
-      break;
-    }
+
+  if (trackSorting) {
+    std::sort(trackTimeNodes.begin(), trackTimeNodes.end(),
+              [](TrackTimeNode a, TrackTimeNode b) {
+                return a.trackTime > b.trackTime;
+              });
+  }
+
+  std::size_t trackCount = trackTimeNodes.size();
+  if (mEnabledFilters.test(Filter::TotalNTracks) && trackCount >= mMaxNTracks) {
+    trackCount = mMaxNTracks;
+  }
+
+  for (auto node : gsl::span<const TrackTimeNode>(trackTimeNodes.data(), trackCount)) {
     mTrackSet.trackGID.push_back(node.trackGID);
     mTrackSet.trackTime.push_back(node.trackTime);
   }
diff --git a/EventVisualisation/Workflow/src/O2DPLDisplay.cxx b/EventVisualisation/Workflow/src/O2DPLDisplay.cxx
@@ -58,6 +58,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
     {"filter-time-min", VariantType::Float, -1.f, {"display tracks only in [min, max] microseconds time range in each time frame, requires --filter-time-max to be specified as well"}},
     {"filter-time-max", VariantType::Float, -1.f, {"display tracks only in [min, max] microseconds time range in each time frame, requires --filter-time-min to be specified as well"}},
     {"remove-tpc-abs-eta", VariantType::Float, 0.f, {"remove TPC tracks in [-eta, +eta] range"}},
+    {"track-sorting", VariantType::Bool, true, {"sort track by track time before applying filters"}},
   };
 
   std::swap(workflowOptions, options);
@@ -97,7 +98,7 @@ void O2DPLDisplaySpec::run(ProcessingContext& pc)
   EveWorkflowHelper helper(enabledFilters, this->mNumberOfTracks, this->mTimeBracket, this->mEtaBracket);
 
   helper.getRecoContainer().collectData(pc, *mDataRequest);
-  helper.selectTracks(&(mData.mConfig->configCalib), mClMask, mTrkMask, mTrkMask);
+  helper.selectTracks(&(mData.mConfig->configCalib), mClMask, mTrkMask, mTrkMask, mTrackSorting);
 
   helper.prepareITSClusters(mData.mITSDict);
   helper.prepareMFTClusters(mData.mMFTDict);
@@ -242,12 +243,16 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 
   auto minITSTracks = cfgc.options().get<int>("min-its-tracks");
   auto minTracks = cfgc.options().get<int>("min-tracks");
+  auto tracksSorting = cfgc.options().get<bool>("track-sorting");
+  if (numberOfTracks == -1) {
+    tracksSorting = false; // do not sort if all tracks are allowed
+  }
 
   specs.emplace_back(DataProcessorSpec{
     "o2-eve-display",
     dataRequest->inputs,
     {},
-    AlgorithmSpec{adaptFromTask<O2DPLDisplaySpec>(useMC, srcTrk, srcCl, dataRequest, jsonFolder, timeInterval, numberOfFiles, numberOfTracks, eveHostNameMatch, minITSTracks, minTracks, filterITSROF, filterTime, timeBracket, removeTPCEta, etaBracket)}});
+    AlgorithmSpec{adaptFromTask<O2DPLDisplaySpec>(useMC, srcTrk, srcCl, dataRequest, jsonFolder, timeInterval, numberOfFiles, numberOfTracks, eveHostNameMatch, minITSTracks, minTracks, filterITSROF, filterTime, timeBracket, removeTPCEta, etaBracket, tracksSorting)}});
 
   return std::move(specs);
 }
