remove post step return

acts-project · Dec 21, 2023 · 5a2ab0a · 5a2ab0a
1 parent 8394535
commit 5a2ab0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/Core/include/Acts/Propagator/TryAllNavigator.hpp b/Core/include/Acts/Propagator/TryAllNavigator.hpp
@@ -324,15 +324,15 @@ class TryAllNavigator {
   /// @return Boolean to indicate if we continue with the actors and
   ///         aborters or if we should target again.
   template <typename propagator_state_t, typename stepper_t>
-  bool postStep(propagator_state_t& state, const stepper_t& stepper) const {
+  void postStep(propagator_state_t& state, const stepper_t& stepper) const {
     ACTS_VERBOSE(volInfo(state) << "post step");
 
     assert(state.navigation.currentSurface == nullptr &&
            "Current surface must be reset.");
 
     if (state.navigation.intersectionCandidates.empty()) {
       ACTS_VERBOSE(volInfo(state) << "no intersections.");
-      return true;
+      return;
     }
 
     std::vector<detail::IntersectionCandidate> hitCandidates;
@@ -355,7 +355,7 @@ class TryAllNavigator {
 
     if (hitCandidates.empty()) {
       ACTS_VERBOSE(volInfo(state) << "Staying focussed on surface.");
-      return true;
+      return;
     }
 
     state.navigation.intersectionCandidates.clear();
@@ -389,7 +389,7 @@ class TryAllNavigator {
     if (trueHitCandidates.empty()) {
       ACTS_VERBOSE(volInfo(state)
                    << "Surface successfully hit, but outside bounds.");
-      return true;
+      return;
     }
 
     if (trueHitCandidates.size() > 1) {
@@ -429,8 +429,6 @@ class TryAllNavigator {
     } else {
       ACTS_ERROR(volInfo(state) << "Unknown intersection type");
     }
-
-    return true;
   }
 
  private:

diff --git a/Core/include/Acts/Propagator/TryAllOverstepNavigator.hpp b/Core/include/Acts/Propagator/TryAllOverstepNavigator.hpp
@@ -323,14 +323,12 @@ class TryAllOverstepNavigator {
   /// @return Boolean to indicate if we continue with the actors and
   ///         aborters or if we should target again.
   template <typename propagator_state_t, typename stepper_t>
-  bool postStep(propagator_state_t& state, const stepper_t& stepper) const {
+  void postStep(propagator_state_t& state, const stepper_t& stepper) const {
     ACTS_VERBOSE(volInfo(state) << "post step");
 
     assert(state.navigation.currentSurface == nullptr &&
            "Current surface must be reset.");
 
-    bool result = true;
-
     if (state.navigation.activeCandidateIndex ==
         state.navigation.activeCandidates.size()) {
       ACTS_VERBOSE(volInfo(state) << "evaluate blind step");
@@ -381,10 +379,7 @@ class TryAllOverstepNavigator {
 
       ACTS_VERBOSE(volInfo(state)
                    << "Found " << state.navigation.activeCandidates.size()
-                   << " intersections")
-
-      result = state.navigation.activeCandidateIndex ==
-               state.navigation.activeCandidates.size();
+                   << " intersections");
     }
 
     if (state.navigation.activeCandidateIndex !=
@@ -415,10 +410,9 @@ class TryAllOverstepNavigator {
 
       if (hitCandidates.empty()) {
         ACTS_VERBOSE(volInfo(state) << "Staying focussed on surface.");
-        return result;
+        return;
       }
 
-      result = true;
       state.navigation.lastIntersection.reset();
 
       std::vector<detail::IntersectionCandidate> trueHitCandidates;
@@ -446,7 +440,7 @@ class TryAllOverstepNavigator {
       if (trueHitCandidates.empty()) {
         ACTS_VERBOSE(volInfo(state)
                      << "Surface successfully hit, but outside bounds.");
-        return true;
+        return;
       }
 
       if (trueHitCandidates.size() > 1) {
@@ -489,8 +483,6 @@ class TryAllOverstepNavigator {
         ACTS_ERROR(volInfo(state) << "Unknown intersection type");
       }
     }
-
-    return result;
   }
 
  private: