ITS: Tracker early exit if no vertex + disallow trklt > dROF

Signed-off-by: Felix Schlepper <[email protected]>

Author: f3sch

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

@@ -82,6 +82,9 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
       }
       const int startVtx{iVertex >= 0 ? iVertex : 0};
       const int endVtx{iVertex >= 0 ? o2::gpu::CAMath::Min(iVertex + 1, static_cast<int>(primaryVertices.size())) : static_cast<int>(primaryVertices.size())};
+      if ((endVtx - startVtx) <= 0) {
+        continue;
+      }
 
       tbb::parallel_for(
         tbb::blocked_range<int>(0, mTrkParams[iteration].TrackletsPerRoad()),
@@ -115,7 +118,7 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
                 const float zAtRmin{tanLambda * (mTimeFrame->getMinR(iLayer + 1) - currentCluster.radius) + currentCluster.zCoordinate};
                 const float zAtRmax{tanLambda * (mTimeFrame->getMaxR(iLayer + 1) - currentCluster.radius) + currentCluster.zCoordinate};
 
-                const float sqInverseDeltaZ0{1.f / (math_utils::Sq(currentCluster.zCoordinate - primaryVertex.getZ()) + 2.e-8f)}; /// protecting from overflows adding the detector resolution
+                const float sqInverseDeltaZ0{1.f / (math_utils::Sq(currentCluster.zCoordinate - primaryVertex.getZ()) + constants::Tolerance)}; /// protecting from overflows adding the detector resolution
                 const float sigmaZ{o2::gpu::CAMath::Sqrt(math_utils::Sq(resolution) * math_utils::Sq(tanLambda) * ((math_utils::Sq(inverseR0) + sqInverseDeltaZ0) * math_utils::Sq(meanDeltaR) + 1.f) + math_utils::Sq(meanDeltaR * mTimeFrame->getMSangle(iLayer)))};
 
                 const int4 selectedBinsRect{getBinsRect(currentCluster, iLayer + 1, zAtRmin, zAtRmax, sigmaZ * mTrkParams[iteration].NSigmaCut, mTimeFrame->getPhiCut(iLayer))};
@@ -130,7 +133,7 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
                 }
 
                 for (int rof1{minRof}; rof1 <= maxRof; ++rof1) {
-                  if (!mTimeFrame->mMultiplicityCutMask[rof1]) {
+                  if (!mTimeFrame->mMultiplicityCutMask[rof1] || std::abs(rof0 - rof1) > mTrkParams[iteration].DeltaROF) {
                     continue;
                   }
                   auto layer1 = mTimeFrame->getClustersOnLayer(rof1, iLayer + 1);
@@ -235,30 +238,34 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
           }
         }
       });
-  });
 
-  /// Create tracklets labels
-  if (mTimeFrame->hasMCinformation()) {
-    for (int iLayer{0}; iLayer < mTrkParams[iteration].TrackletsPerRoad(); ++iLayer) {
-      for (auto& trk : mTimeFrame->getTracklets()[iLayer]) {
-        MCCompLabel label;
-        int currentId{mTimeFrame->getClusters()[iLayer][trk.firstClusterIndex].clusterId};
-        int nextId{mTimeFrame->getClusters()[iLayer + 1][trk.secondClusterIndex].clusterId};
-        for (auto& lab1 : mTimeFrame->getClusterLabels(iLayer, currentId)) {
-          for (auto& lab2 : mTimeFrame->getClusterLabels(iLayer + 1, nextId)) {
-            if (lab1 == lab2 && lab1.isValid()) {
-              label = lab1;
-              break;
+    /// Create tracklets labels
+    if (mTimeFrame->hasMCinformation()) {
+      tbb::parallel_for(
+        tbb::blocked_range<int>(0, mTrkParams[iteration].TrackletsPerRoad()),
+        [&](const tbb::blocked_range<int>& Layers) {
+          for (int iLayer = Layers.begin(); iLayer < Layers.end(); ++iLayer) {
+            for (auto& trk : mTimeFrame->getTracklets()[iLayer]) {
+              MCCompLabel label;
+              int currentId{mTimeFrame->getClusters()[iLayer][trk.firstClusterIndex].clusterId};
+              int nextId{mTimeFrame->getClusters()[iLayer + 1][trk.secondClusterIndex].clusterId};
+              for (const auto& lab1 : mTimeFrame->getClusterLabels(iLayer, currentId)) {
+                for (const auto& lab2 : mTimeFrame->getClusterLabels(iLayer + 1, nextId)) {
+                  if (lab1 == lab2 && lab1.isValid()) {
+                    label = lab1;
+                    break;
+                  }
+                }
+                if (label.isValid()) {
+                  break;
+                }
+              }
+              mTimeFrame->getTrackletsLabel(iLayer).emplace_back(label);
             }
           }
-          if (label.isValid()) {
-            break;
-          }
-        }
-        mTimeFrame->getTrackletsLabel(iLayer).emplace_back(label);
-      }
+        });
     }
-  }
+  });
 }
 
 template <int nLayers>