ITS: template Tracker

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

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

@@ -51,17 +51,15 @@ class GPUChainITS;
 namespace its
 {
 
+template <int nLayers>
 class Tracker
 {
-  static constexpr int NLayers{7};
-  using TrackerTraits7 = TrackerTraits<NLayers>;
-  using TimeFrame7 = TimeFrame<NLayers>;
   using LogFunc = std::function<void(const std::string& s)>;
 
  public:
-  Tracker(TrackerTraits<NLayers>* traits);
+  Tracker(TrackerTraits<nLayers>* traits);
 
-  void adoptTimeFrame(TimeFrame<NLayers>& tf);
+  void adoptTimeFrame(TimeFrame<nLayers>& tf);
 
   void clustersToTracks(
     const LogFunc& = [](const std::string& s) { std::cout << s << '\n'; },
@@ -92,8 +90,8 @@ class Tracker
   template <typename... T, typename... F>
   float evaluateTask(void (Tracker::*task)(T...), std::string_view taskName, int iteration, LogFunc logger, F&&... args);
 
-  TrackerTraits7* mTraits = nullptr; /// Observer pointer, not owned by this class
-  TimeFrame7* mTimeFrame = nullptr;  /// Observer pointer, not owned by this class
+  TrackerTraits<nLayers>* mTraits = nullptr; /// Observer pointer, not owned by this class
+  TimeFrame<nLayers>* mTimeFrame = nullptr;  /// Observer pointer, not owned by this class
 
   std::vector<TrackingParameters> mTrkParams;
   o2::gpu::GPUChainITS* mRecoChain = nullptr;
@@ -115,8 +113,9 @@ class Tracker
   static constexpr std::array<const char*, NStates> StateNames{"TimeFrame initialisation", "Tracklet finding", "Cell finding", "Neighbour finding", "Road finding"};
 };
 
+template <int nLayers>
 template <typename... T, typename... F>
-float Tracker::evaluateTask(void (Tracker::*task)(T...), std::string_view taskName, int iteration, LogFunc logger, F&&... args)
+float Tracker<nLayers>::evaluateTask(void (Tracker<nLayers>::*task)(T...), std::string_view taskName, int iteration, LogFunc logger, F&&... args)
 {
   float diff{0.f};
 

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

@@ -35,8 +35,9 @@ namespace o2::its
 class ITSTrackingInterface
 {
   static constexpr int NLayers{7};
-  using TrackerTraits7 = TrackerTraits<NLayers>;
-  using TimeFrame7 = TimeFrame<NLayers>;
+  using TrackerN = Tracker<NLayers>;
+  using TrackerTraitsN = TrackerTraits<NLayers>;
+  using TimeFrameN = TimeFrame<NLayers>;
 
  public:
   ITSTrackingInterface(bool isMC,
@@ -66,13 +67,13 @@ class ITSTrackingInterface
   virtual void finaliseCCDB(framework::ConcreteDataMatcher& matcher, void* obj);
 
   // Custom
-  void setTraitsFromProvider(VertexerTraits*, TrackerTraits7*, TimeFrame7*);
+  void setTraitsFromProvider(VertexerTraits*, TrackerTraitsN*, TimeFrameN*);
   void setTrackingMode(TrackingMode::Type mode = TrackingMode::Unset) { mMode = mode; }
 
   auto getTracker() const { return mTracker.get(); }
   auto getVertexer() const { return mVertexer.get(); }
 
-  TimeFrame7* mTimeFrame = nullptr;
+  TimeFrameN* mTimeFrame = nullptr;
 
  protected:
   virtual void loadROF(gsl::span<itsmft::ROFRecord>& trackROFspan,
@@ -88,7 +89,7 @@ class ITSTrackingInterface
   TrackingMode::Type mMode = TrackingMode::Unset;
   bool mOverrideBeamEstimation = false;
   const o2::itsmft::TopologyDictionary* mDict = nullptr;
-  std::unique_ptr<Tracker> mTracker = nullptr;
+  std::unique_ptr<TrackerN> mTracker = nullptr;
   std::unique_ptr<Vertexer> mVertexer = nullptr;
   const o2::dataformats::MeanVertexObject* mMeanVertex;
   std::shared_ptr<BoundedMemoryResource> mMemoryPool;

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

@@ -34,7 +34,8 @@ namespace o2::its
 {
 using o2::its::constants::GB;
 
-Tracker::Tracker(TrackerTraits7* traits) : mTraits(traits)
+template <int nLayers>
+Tracker<nLayers>::Tracker(TrackerTraits<nLayers>* traits) : mTraits(traits)
 {
   /// Initialise standard configuration with 1 iteration
   mTrkParams.resize(1);
@@ -44,7 +45,8 @@ Tracker::Tracker(TrackerTraits7* traits) : mTraits(traits)
   }
 }
 
-void Tracker::clustersToTracks(const LogFunc& logger, const LogFunc& error)
+template <int nLayers>
+void Tracker<nLayers>::clustersToTracks(const LogFunc& logger, const LogFunc& error)
 {
   LogFunc evalLog = [](const std::string&) {};
 
@@ -158,7 +160,8 @@ void Tracker::clustersToTracks(const LogFunc& logger, const LogFunc& error)
   }
 }
 
-void Tracker::computeRoadsMClabels()
+template <int nLayers>
+void Tracker<nLayers>::computeRoadsMClabels()
 {
   /// Moore's Voting Algorithm
   if (!mTimeFrame->hasMCinformation()) {
@@ -171,7 +174,7 @@ void Tracker::computeRoadsMClabels()
 
   for (int iRoad{0}; iRoad < roadsNum; ++iRoad) {
 
-    Road<5>& currentRoad{mTimeFrame->getRoads()[iRoad]};
+    auto& currentRoad{mTimeFrame->getRoads()[iRoad]};
     std::vector<std::pair<MCCompLabel, size_t>> occurrences;
     bool isFakeRoad{false};
     bool isFirstRoadCell{true};
@@ -262,7 +265,8 @@ void Tracker::computeRoadsMClabels()
   }
 }
 
-void Tracker::computeTracksMClabels()
+template <int nLayers>
+void Tracker<nLayers>::computeTracksMClabels()
 {
   for (int iROF{0}; iROF < mTimeFrame->getNrof(); ++iROF) {
     for (auto& track : mTimeFrame->getTracks(iROF)) {
@@ -320,7 +324,8 @@ void Tracker::computeTracksMClabels()
   }
 }
 
-void Tracker::rectifyClusterIndices()
+template <int nLayers>
+void Tracker<nLayers>::rectifyClusterIndices()
 {
   for (int iROF{0}; iROF < mTimeFrame->getNrof(); ++iROF) {
     for (auto& track : mTimeFrame->getTracks(iROF)) {
@@ -334,17 +339,21 @@ void Tracker::rectifyClusterIndices()
   }
 }
 
-void Tracker::adoptTimeFrame(TimeFrame7& tf)
+template <int nLayers>
+void Tracker<nLayers>::adoptTimeFrame(TimeFrame<nLayers>& tf)
 {
   mTimeFrame = &tf;
   mTraits->adoptTimeFrame(&tf);
 }
 
-void Tracker::printSummary() const
+template <int nLayers>
+void Tracker<nLayers>::printSummary() const
 {
   auto avgTF = mTotalTime * 1.e-3 / ((mTimeFrameCounter > 0) ? (double)mTimeFrameCounter : -1.0);
   auto avgTFwithDropped = mTotalTime * 1.e-3 / (((mTimeFrameCounter + mNumberOfDroppedTFs) > 0) ? (double)(mTimeFrameCounter + mNumberOfDroppedTFs) : -1.0);
   LOGP(info, "Tracker summary: Processed {} TFs (dropped {}) in TOT={:.2f} s, AVG/TF={:.2f} ({:.2f}) s", mTimeFrameCounter, mNumberOfDroppedTFs, mTotalTime * 1.e-3, avgTF, avgTFwithDropped);
 }
 
+template class Tracker<7>;
+
 } // namespace o2::its

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

@@ -383,11 +383,11 @@ void ITSTrackingInterface::printSummary() const
 }
 
 void ITSTrackingInterface::setTraitsFromProvider(VertexerTraits* vertexerTraits,
-                                                 TrackerTraits7* trackerTraits,
-                                                 TimeFrame7* frame)
+                                                 TrackerTraitsN* trackerTraits,
+                                                 TimeFrameN* frame)
 {
   mVertexer = std::make_unique<Vertexer>(vertexerTraits);
-  mTracker = std::make_unique<Tracker>(trackerTraits);
+  mTracker = std::make_unique<TrackerN>(trackerTraits);
   mTimeFrame = frame;
   mVertexer->adoptTimeFrame(*mTimeFrame);
   mTracker->adoptTimeFrame(*mTimeFrame);