fix uninitilised and tie nMajorityHits

AJPfleger · Sep 8, 2024 · b217434 · b217434
1 parent 16828c0
commit b217434
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/Core/include/Acts/Navigation/MultiLayerNavigation.hpp b/Core/include/Acts/Navigation/MultiLayerNavigation.hpp
@@ -108,8 +108,11 @@ class MultiLayerNavigation : public IInternalNavigation {
                          std::vector<const Acts::Surface*>& surfaces) const {
     // sorting the surfaces according to their radial distance
     std::ranges::sort(surfaces, {}, [&gctx](const auto& s) {
-      return std::tie(s->center(gctx).x(), s->center(gctx).y(),
-                      s->center(gctx).z());
+      // copy to prevent problem with uninitialised variables
+      auto centerX = s->center(gctx).x();
+      auto centerY = s->center(gctx).y();
+      auto centerZ = s->center(gctx).z();
+      return std::tie(centerX, centerY, centerZ);
     });
 
     // Remove the duplicates

diff --git a/Core/src/TrackFitting/GsfMixtureReduction.cpp b/Core/src/TrackFitting/GsfMixtureReduction.cpp
@@ -37,7 +37,8 @@ void reduceWithKLDistanceImpl(std::vector<Acts::GsfComponent> &cmpCache,
   }
 
   // Remove all components which are labeled with weight -1
-  std::ranges::sort(cmpCache, {}, [](const auto &c) { return proj(c).weight; });
+  std::ranges::sort(cmpCache, {},
+                    [&](const auto &c) { return proj(c).weight; });
   cmpCache.erase(
       std::remove_if(cmpCache.begin(), cmpCache.end(),
                      [&](const auto &a) { return proj(a).weight == -1.0; }),

diff --git a/Examples/Io/Csv/src/CsvTrackWriter.cpp b/Examples/Io/Csv/src/CsvTrackWriter.cpp
@@ -28,6 +28,7 @@
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -159,19 +160,14 @@ ProcessCode CsvTrackWriter::writeT(const AlgorithmContext& context,
   // Find duplicates
   std::unordered_set<std::size_t> listGoodTracks;
   for (auto& [particleId, matchedTracks] : matched) {
-    std::sort(matchedTracks.begin(), matchedTracks.end(),
-              [](const RecoTrackInfo& lhs, const RecoTrackInfo& rhs) {
-                // sort by nMajorityHits
-                if (lhs.first.nMajorityHits != rhs.first.nMajorityHits) {
-                  return (lhs.first.nMajorityHits > rhs.first.nMajorityHits);
-                }
-                // sort by nOutliers
-                if (lhs.first.nOutliers != rhs.first.nOutliers) {
-                  return (lhs.first.nOutliers < rhs.first.nOutliers);
-                }
-                // sort by chi2
-                return (lhs.first.chi2Sum < rhs.first.chi2Sum);
-              });
+    std::ranges::sort(
+        matchedTracks, [](const RecoTrackInfo& lhs, const RecoTrackInfo& rhs) {
+          // nMajorityHits are sorted descending, others ascending
+          return std::tie(rhs.first.nMajorityHits, lhs.first.nOutliers,
+                          lhs.first.chi2Sum) < std::tie(lhs.first.nMajorityHits,
+                                                        rhs.first.nOutliers,
+                                                        rhs.first.chi2Sum);
+        });
 
     listGoodTracks.insert(matchedTracks.front().first.trackId);
   }