other improvements

acts-project · Oct 2, 2024 · 9b37664 · 9b37664
1 parent fc0536d
commit 9b37664
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/Core/include/Acts/TrackFitting/KalmanFitter.hpp b/Core/include/Acts/TrackFitting/KalmanFitter.hpp
@@ -33,7 +33,6 @@
 #include "Acts/Utilities/Result.hpp"
 #include "Acts/Utilities/TrackHelpers.hpp"
 
-#include <algorithm>
 #include <functional>
 #include <limits>
 #include <map>
@@ -485,9 +484,8 @@ class KalmanFitter {
             result.fittedStates->applyBackwards(
                 result.lastMeasurementIndex, [&](auto trackState) {
                   auto fSurface = &trackState.referenceSurface();
-                  if (std::ranges::none_of(
-                          result.passedAgainSurfaces,
-                          [=](const Surface* s) { return s == fSurface; })) {
+                  if (!rangeContainsValue(result.passedAgainSurfaces,
+                                          fSurface)) {
                     // If reversed filtering missed this surface, then there is
                     // no smoothed parameter
                     trackState.unset(TrackStatePropMask::Smoothed);

diff --git a/Core/src/Geometry/Layer.cpp b/Core/src/Geometry/Layer.cpp
@@ -138,7 +138,7 @@ Acts::Layer::compatibleSurfaces(
     if (sensitive && options.resolveSensitive) {
       return true;
     }
-    // next option: it's a material surface and you want to have it
+    // next option: it's a material surface, and you want to have it
     if (options.resolveMaterial && sf.surfaceMaterial() != nullptr) {
       return true;
     }

diff --git a/Core/src/Vertexing/IterativeVertexFinder.cpp b/Core/src/Vertexing/IterativeVertexFinder.cpp
@@ -283,9 +283,7 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
     }
     // Find and remove track from seedTracks
     auto foundSeedIter =
-        std::ranges::find_if(seedTracks, [&trackAtVtx](const auto& seedTrk) {
-          return trackAtVtx.originalParams == seedTrk;
-        });
+        std::ranges::find(seedTracks, trackAtVtx.originalParams);
     if (foundSeedIter != seedTracks.end()) {
       seedTracks.erase(foundSeedIter);
     } else {
@@ -294,9 +292,7 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
 
     // Find and remove track from tracksToFit
     auto foundFitIter =
-        std::ranges::find_if(tracksToFit, [&trackAtVtx](const auto& fitTrk) {
-          return trackAtVtx.originalParams == fitTrk;
-        });
+        std::ranges::find(tracksToFit, trackAtVtx.originalParams);
     if (foundFitIter != tracksToFit.end()) {
       tracksToFit.erase(foundFitIter);
     } else {
@@ -331,8 +327,7 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
     // check if sufficiently compatible with last fitted vertex
     // (quite loose constraint)
     if (chi2 < m_cfg.maximumChi2cutForSeeding) {
-      auto foundIter = std::ranges::find_if(
-          seedTracks, [&trk](const auto& seedTrk) { return trk == seedTrk; });
+      auto foundIter = std::ranges::find(seedTracks, trk);
       if (foundIter != seedTracks.end()) {
         // Remove track from seed tracks
         seedTracks.erase(foundIter);

diff --git a/Plugins/Detray/src/DetrayGeometryConverter.cpp b/Plugins/Detray/src/DetrayGeometryConverter.cpp
@@ -23,7 +23,7 @@
 
 #include <algorithm>
 
-#include "detray/io/frontend/detector_writer.hpp"
+#include <detray/io/frontend/detector_writer.hpp>
 
 using namespace detray;