track refit good

Author: f3sch

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

@@ -593,25 +593,32 @@ void TrackerTraits<nLayers>::findRoads(const int iteration)
         lastCellSeed.swap(updatedCellSeed);
         lastCellId.swap(updatedCellId);
         deepVectorClear(updatedCellSeed); /// tame the memory peaks
-        updatedCellId.clear();
+        deepVectorClear(updatedCellId);   /// tame the memory peaks
         processNeighbours(iLayer, --level, lastCellSeed, lastCellId, updatedCellSeed, updatedCellId);
       }
-      for (auto& seed : updatedCellSeed) {
-        if (seed.getQ2Pt() > 1.e3 || seed.getChi2() > mTrkParams[0].MaxChi2NDF * ((startLevel + 2) * 2 - 5)) {
-          continue;
-        }
-        trackSeeds.push_back(seed);
-      }
+      std::copy_if(updatedCellSeed.begin(), updatedCellSeed.end(), std::back_inserter(trackSeeds), [&](const CellSeed& seed) {
+        return seed.getQ2Pt() <= 1.e3 && seed.getChi2() <= mTrkParams[0].MaxChi2NDF * ((startLevel + 2) * 2 - 5);
+      });
     }
 
-    bounded_vector<TrackITSExt> tracks(trackSeeds.size(), mMemoryPool.get());
-    std::atomic<size_t> trackIndex{0};
+    if (trackSeeds.empty()) {
+      continue;
+    }
 
+    bounded_vector<TrackITSExt> tracks(mMemoryPool.get());
+    tracks.reserve(trackSeeds.size());
     mTaskArena.execute([&] {
+      tbb::combinable<bounded_vector<TrackITSExt>> locTracksData([&] {
+        return bounded_vector<TrackITSExt>(mMemoryPool.get());
+      });
+
       tbb::parallel_for(
         tbb::blocked_range<size_t>(size_t(0), trackSeeds.size()),
         [&](const tbb::blocked_range<size_t>& Seeds) {
           for (int iSeed = Seeds.begin(); iSeed < Seeds.end(); ++iSeed) {
+            auto& localTracks = locTracksData.local();
+            localTracks.reserve(Seeds.size());
+
             const CellSeed& seed{trackSeeds[iSeed]};
             TrackITSExt temporaryTrack{seed};
             temporaryTrack.resetCovariance();
@@ -631,13 +638,15 @@ void TrackerTraits<nLayers>::findRoads(const int iteration)
             if (!fitSuccess || temporaryTrack.getPt() < mTrkParams[iteration].MinPt[mTrkParams[iteration].NLayers - temporaryTrack.getNClusters()]) {
               continue;
             }
-            tracks[trackIndex++] = temporaryTrack;
+            localTracks.push_back(temporaryTrack);
           }
         });
-    });
 
-    tracks.resize(trackIndex);
-    mTaskArena.execute([&] {
+      locTracksData.combine_each([&](const bounded_vector<TrackITSExt>& localTracks) {
+        tracks.insert(tracks.end(), localTracks.begin(), localTracks.end());
+      });
+      tracks.shrink_to_fit();
+
       tbb::parallel_sort(tracks.begin(), tracks.end(), [](const auto& a, const auto& b) {
         return a.getChi2() < b.getChi2();
       });