ITS: implement caclulation of lookup window with vertex error

Author: f3sch

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Configuration.h

@@ -54,8 +54,6 @@ struct TrackingParameters {
   int ClusterSharing = 0;
   int MinTrackLength = 7;
   float NSigmaCut = 5;
-  float NSigmaCutZ = 5;
-  float NSigmaCutPhi = 5;
   int NTimeSlices{1};
   /// Trackleting cuts
   float TrackletMinPt = 0.3f;

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Definitions.h

@@ -34,8 +34,8 @@ using maybe_const = std::conditional_t<IsConst, const T, T>;
 
 // simple implemnetion of logging with exp. backoff
 struct LogLogThrottler {
-  uint32_t evCount{0};
-  uint32_t nextLog{1};
+  uint64_t evCount{0};
+  uint64_t nextLog{1};
   int32_t iteration{-1};
   int32_t layer{-1};
   bool needToLog(int32_t iter, int32_t lay)

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TimeFrame.h

@@ -151,14 +151,14 @@ struct TimeFrame {
     mROFOverlapTable = std::move(table);
     mROFOverlapTableView = mROFOverlapTable.getView();
   }
-  auto& getROFVertexLookupTable() { return mROFVertexLookupTable; }
   const auto& getROFVertexLookupTable() const { return mROFVertexLookupTable; }
   const auto& getROFVertexLookupTableView() const { return mROFVertexLookupTableView; }
   void setROFVertexLookupTable(ROFVertexLookupTableN& table)
   {
     mROFVertexLookupTable = std::move(table);
     mROFVertexLookupTableView = mROFVertexLookupTable.getView();
   }
+  void updateROFVertexLookupTable() { mROFVertexLookupTable.update(mPrimaryVertices.data(), mPrimaryVertices.size()); }
   const auto& getROFTimeSliceTable() const { return mROFTimeSliceTable; }
   const auto& getROFTimeSliceTableView() const { return mROFTimeSliceTableView; }
   void setROFTimeSliceTable(ROFTimeSliceTableN& table)

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackerTraits.h

@@ -88,8 +88,8 @@ class TrackerTraits
 
   // Others
   GPUhd() static consteval int4 getEmptyBinsRect() { return int4{0, 0, 0, 0}; }
-  const int4 getBinsRect(const int iteration, int layer, float phi, float maxdeltaphi, float z, float maxdeltaz) const noexcept { return getBinsRect(iteration, layer, phi, maxdeltaphi, z, z, maxdeltaz); }
-  const int4 getBinsRect(const int iteration, const Cluster& cls, int layer, float z1, float z2, float maxdeltaz, float maxdeltaphi) const noexcept { return getBinsRect(iteration, layer, cls.phi, maxdeltaphi, z1, z2, maxdeltaz); }
+  int4 getBinsRect(const int iteration, int layer, float phi, float maxdeltaphi, float z, float maxdeltaz) const noexcept { return getBinsRect(iteration, layer, phi, maxdeltaphi, z, z, maxdeltaz); }
+  int4 getBinsRect(const int iteration, const Cluster& cls, int layer, float z1, float z2, float maxdeltaz, float maxdeltaphi) const noexcept { return getBinsRect(iteration, layer, cls.phi, maxdeltaphi, z1, z2, maxdeltaz); }
   const int4 getBinsRect(const int iteration, int layer, float phi, float maxdeltaphi, float z1, float z2, float maxdeltaz) const noexcept;
 
   void SetRecoChain(o2::gpu::GPUChainITS* chain) { mChain = chain; }
@@ -106,23 +106,24 @@ class TrackerTraits
  private:
   track::TrackParCov buildTrackSeed(const Cluster& cluster1, const Cluster& cluster2, const TrackingFrameInfo& tf3);
   bool fitTrack(TrackITSExt& track, int start, int end, int step, float chi2clcut = o2::constants::math::VeryBig, float chi2ndfcut = o2::constants::math::VeryBig, float maxQoverPt = o2::constants::math::VeryBig, int nCl = 0);
-
-  std::shared_ptr<BoundedMemoryResource> mMemoryPool;
-  std::shared_ptr<tbb::task_arena> mTaskArena;
+  void sortSeeds();
 
   // Debug output
   inline void debugComputeLayerTracklets(int iteration, int layer, const Cluster& currentCls, const Cluster& nextCls, const Vertex& pv, float sigmaZ, float sigmaPhi, bool accepted);
   inline void debugComputeLayerCells(int iteration, int layer, int currentTrkl, int nextTrkl, bool accepted);
   inline void debugFindCellsNeighbours(int iteration, int layer, int currentCell, int nextCell, bool accepted);
 
+  std::shared_ptr<BoundedMemoryResource> mMemoryPool;
+  std::shared_ptr<tbb::task_arena> mTaskArena;
+  dbscan::DBSCAN mDBScan;
+
  protected:
   o2::gpu::GPUChainITS* mChain = nullptr;
   TimeFrame<NLayers>* mTimeFrame;
   std::vector<RecoIteration> mRecoParams;
 
   float mBz{-999.f};
   bool mIsZeroField{false};
-  dbscan::DBSCAN mDBScan{};
 };
 
 template <int NLayers>

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackingConfigParam.h

@@ -72,6 +72,7 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
   bool seedingUseMCTruth{false};           // skip seeding and impose MC event information
 
   bool createArtefactLabels{false}; // create on-the-fly labels for the artefacts
+  int nIterations{-1};              // reduce the number of iterations
 
   int nThreads = 1;
   bool printMemory = false;

Detectors/ITSMFT/ITS/tracking/src/Configuration.cxx

@@ -167,8 +167,6 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
     p.PhiBins = tc.LUTbinsPhi > 0 ? tc.LUTbinsPhi : p.PhiBins;
     p.ZBins = tc.LUTbinsZ > 0 ? tc.LUTbinsZ : p.ZBins;
     p.NSigmaCut *= tc.nSigmaCut > 0 ? tc.nSigmaCut : 1.f;
-    p.NSigmaCutZ *= tc.nSigmaCutZ > 0 ? tc.nSigmaCutZ : 1.f;
-    p.NSigmaCutPhi *= tc.nSigmaCutPhi > 0 ? tc.nSigmaCutPhi : 1.f;
     p.CellDeltaTanLambdaSigma *= tc.deltaTanLres > 0 ? tc.deltaTanLres : 1.f;
     p.TrackletMinPt *= tc.minPt > 0 ? tc.minPt : 1.f;
     p.PerPrimaryVertexProcessing = tc.perPrimaryVertexProcessing;
@@ -211,6 +209,7 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
     recoIterations[0].params.SeedingDBScanMinPt = tc.seedingDBScanMinPt;
     recoIterations[0].params.SeedingDBScanEpsZ = tc.seedingDBScanEpsZ;
     recoIterations[0].params.SeedingDBScanEpsT = tc.seedingDBScanEpsT;
+    recoIterations[0].params.PerPrimaryVertexProcessing = false;
 
     if (tc.seedingUseMCTruth) {
       recoIterations[0].name = "MC_SEEDING";
@@ -280,6 +279,11 @@ std::vector<RecoIteration> TrackingMode::getRecoIterations(TrackingMode::Type mo
     recoIterations[0].params.MaxChi2NDF = 40.;
   }
 
+  // opt. suppress layer iterations
+  if (tc.nIterations >= 0 && tc.nIterations < recoIterations.size()) {
+    recoIterations.resize(tc.nIterations);
+  }
+
   return recoIterations;
 }
 

Detectors/ITSMFT/ITS/tracking/src/Tracker.cxx

@@ -76,7 +76,7 @@ void Tracker<NLayers>::clustersToTracks(const LogFunc& logger, const LogFunc& er
       mMemoryPool->setMaxMemory(reco.params.MaxMemory);
       // rebuilt rof -> vertex lookup table
       if (reco.steps[kUpdateVertexTable] && mTimeFrame->getROFVertexLookupTable().needsUpdate()) {
-        mTimeFrame->getROFVertexLookupTable().update(mTimeFrame->getPrimaryVertices().data(), mTimeFrame->getPrimaryVertices().size());
+        mTimeFrame->updateROFVertexLookupTable();
       }
       if (reco.params.PerPrimaryVertexProcessing) { // find the largest span of seeding vertices found
         maxNvertices = mTimeFrame->getROFVertexLookupTableView().getMaxVerticesPerROF();