fix perVtx

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

Author: f3sch

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

@@ -88,7 +88,7 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
       int localCount = 0;
       auto& tracklets = mTimeFrame->getTracklets()[iLayer];
       for (int targetROF0{minROF}; targetROF0 <= maxROF; ++targetROF0) {
-        if (!mTimeFrame->mMultiplicityCutMask[targetROF0]) {
+        if (!mTimeFrame->mMultiplicityCutMask[targetROF0] || (iLayer == 0 && targetROF0 != pivotROF)) {
           continue;
         }
         auto layer0 = mTimeFrame->getClustersOnLayer(targetROF0, iLayer);
@@ -201,24 +201,40 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
         }
       }
     } else {
-      bounded_vector<bounded_vector<int>> perCount(mTrkParams[iteration].TrackletsPerRoad(), bounded_vector<int>(endROF - startROF, 0, mMemoryPool.get()), mMemoryPool.get());
-      auto perOffset = perCount;
+      bounded_vector<bounded_vector<int>> perROFCount(mTrkParams[iteration].TrackletsPerRoad(), bounded_vector<int>(endROF - startROF + 1, 0, mMemoryPool.get()), mMemoryPool.get());
+      tbb::parallel_for(
+        tbb::blocked_range2d<int, int>(0, mTrkParams[iteration].TrackletsPerRoad(), 1,
+                                       startROF, endROF, 1),
+        [&](auto const& Range) {
+          for (int iLayer{Range.rows().begin()}; iLayer < Range.rows().end(); ++iLayer) {
+            for (int pivotROF = Range.cols().begin(); pivotROF < Range.cols().end(); ++pivotROF) {
+              perROFCount[iLayer][pivotROF - startROF] = forTracklets(PassMode::TwoPassCount{}, iLayer, pivotROF, 0, dummy);
+            }
+          }
+        });
+
       tbb::parallel_for(
         tbb::blocked_range<int>(0, mTrkParams[iteration].TrackletsPerRoad()),
         [&](auto const& Layers) {
           for (int iLayer{Layers.begin()}; iLayer < Layers.end(); ++iLayer) {
-            for (int pivotROF{startROF}; pivotROF < endROF; ++pivotROF) {
-              perCount[iLayer][pivotROF - startROF] = forTracklets(PassMode::TwoPassCount{}, iLayer, pivotROF, 0, dummy);
-            }
-
-            std::exclusive_scan(perCount[iLayer].begin(), perCount[iLayer].end(), perOffset[iLayer].begin(), 0);
-            int total = perOffset[iLayer].back() + perCount[iLayer].back();
-            auto& tracklets = mTimeFrame->getTracklets()[iLayer];
-            tracklets.resize(total);
+            std::exclusive_scan(perROFCount[iLayer].begin(), perROFCount[iLayer].end(), perROFCount[iLayer].begin(), 0);
+            mTimeFrame->getTracklets()[iLayer].resize(perROFCount[iLayer].back());
+          }
+        });
 
-            auto& offsets = perOffset[iLayer];
-            for (int pivotROF = startROF; pivotROF < endROF; ++pivotROF) {
-              int baseIdx = offsets[pivotROF - startROF];
+      tbb::parallel_for(
+        tbb::blocked_range2d<int, int>(0, mTrkParams[iteration].TrackletsPerRoad(), 1,
+                                       startROF, endROF, 1),
+        [&](auto const& Range) {
+          for (int iLayer{Range.rows().begin()}; iLayer < Range.rows().end(); ++iLayer) {
+            if (perROFCount[iLayer].back() == 0) {
+              continue;
+            }
+            for (int pivotROF = Range.cols().begin(); pivotROF < Range.cols().end(); ++pivotROF) {
+              int baseIdx = perROFCount[iLayer][pivotROF - startROF];
+              if (baseIdx == perROFCount[iLayer][pivotROF - startROF + 1]) {
+                continue;
+              }
               int localIdx = 0;
               forTracklets(PassMode::TwoPassInsert{}, iLayer, pivotROF, baseIdx, localIdx);
             }