test3

Author: f3sch

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

@@ -12,24 +12,24 @@
 /// \file TrackerTraits.cxx
 /// \brief
 ///
-
-#include "ITStracking/TrackerTraits.h"
-#include <oneapi/tbb/parallel_sort.h>
-
 #include <algorithm>
 #include <cassert>
 #include <iostream>
-#include "ITStracking/BoundedAllocator.h"
 
 #ifdef OPTIMISATION_OUTPUT
 #include <format>
 #endif
 
+#include <oneapi/tbb/combinable.h>
+#include <oneapi/tbb/parallel_sort.h>
+
 #include "CommonConstants/MathConstants.h"
 #include "DetectorsBase/Propagator.h"
 #include "GPUCommonMath.h"
 #include "ITStracking/Cell.h"
 #include "ITStracking/Constants.h"
+#include "ITStracking/TrackerTraits.h"
+#include "ITStracking/BoundedAllocator.h"
 #include "ITStracking/IndexTableUtils.h"
 #include "ITStracking/Tracklet.h"
 #include "ReconstructionDataFormats/Track.h"
@@ -80,8 +80,8 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
     mTaskArena.execute([&] {
       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) {
+        [&](const tbb::blocked_range<int>& Layers) {
+          for (int iLayer = Layers.begin(); iLayer < Layers.end(); ++iLayer) {
             gsl::span<const Cluster> layer0 = mTimeFrame->getClustersOnLayer(rof0, iLayer);
             if (layer0.empty()) {
               continue;
@@ -209,8 +209,8 @@ void TrackerTraits<nLayers>::computeLayerTracklets(const int iteration, int iROF
   mTaskArena.execute([&] {
     tbb::parallel_for(
       tbb::blocked_range<int>(0, mTrkParams[iteration].CellsPerRoad()),
-      [&](const tbb::blocked_range<int>& layers) {
-        for (int iLayer = layers.begin(); iLayer < layers.end(); ++iLayer) {
+      [&](const tbb::blocked_range<int>& Layers) {
+        for (int iLayer = Layers.begin(); iLayer < Layers.end(); ++iLayer) {
           /// Sort tracklets
           auto& trkl{mTimeFrame->getTracklets()[iLayer + 1]};
           tbb::parallel_sort(trkl.begin(), trkl.end(), sortTracklets);
@@ -282,8 +282,8 @@ void TrackerTraits<nLayers>::computeLayerCells(const int iteration)
   mTaskArena.execute([&] {
     tbb::parallel_for(
       tbb::blocked_range<int>(0, mTrkParams[iteration].CellsPerRoad()),
-      [&](const tbb::blocked_range<int>& layers) {
-        for (int iLayer = layers.begin(); iLayer < layers.end(); ++iLayer) {
+      [&](const tbb::blocked_range<int>& Layers) {
+        for (int iLayer = Layers.begin(); iLayer < Layers.end(); ++iLayer) {
 
           if (mTimeFrame->getTracklets()[iLayer + 1].empty() ||
               mTimeFrame->getTracklets()[iLayer].empty()) {
@@ -579,11 +579,11 @@ template <int nLayers>
 void TrackerTraits<nLayers>::findRoads(const int iteration)
 {
   CA_DEBUGGER(std::cout << "Finding roads, iteration " << iteration << std::endl);
+
   for (int startLevel{mTrkParams[iteration].CellsPerRoad()}; startLevel >= mTrkParams[iteration].CellMinimumLevel(); --startLevel) {
     CA_DEBUGGER(std::cout << "\t > Processing level " << startLevel << std::endl);
-    const int minimumLayer{startLevel - 1};
     bounded_vector<CellSeed> trackSeeds(mMemoryPool.get());
-    for (int startLayer{mTrkParams[iteration].CellsPerRoad() - 1}; startLayer >= minimumLayer; --startLayer) {
+    for (int startLayer{mTrkParams[iteration].CellsPerRoad() - 1}; startLayer >= startLevel - 1; --startLayer) {
       if ((mTrkParams[iteration].StartLayerMask & (1 << (startLayer + 2))) == 0) {
         continue;
       }