refactor: remove dead actor code (#1950)

"observer" functions are not called if there is a proper actor function
acts-project · Mar 15, 2023 · fcfddfc · fcfddfc
1 parent 447f0a2
commit fcfddfc
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 73 deletions.
diff --git a/Core/include/Acts/Material/MaterialCollector.hpp b/Core/include/Acts/Material/MaterialCollector.hpp
@@ -133,10 +133,5 @@ struct MaterialCollector {
       }
     }
   }
-
-  /// Pure observer interface
-  /// - this does not apply to the surface collector
-  template <typename propagator_state_t>
-  void operator()(propagator_state_t& /*state*/) const {}
 };  // namespace Acts
 }  // namespace Acts
diff --git a/Core/include/Acts/Propagator/DirectNavigator.hpp b/Core/include/Acts/Propagator/DirectNavigator.hpp
@@ -82,13 +82,6 @@ class DirectNavigator {
         r.initialized = true;
       }
     }
-
-    /// Actor operator call - resultless, unused
-    template <typename propagator_state_t, typename stepper_t,
-              typename navigator_t>
-    void operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-                    const navigator_t& /*navigator*/,
-                    const Logger& /*logger*/) const {}
   };
 
   /// Nested State struct

diff --git a/Core/include/Acts/Propagator/MaterialInteractor.hpp b/Core/include/Acts/Propagator/MaterialInteractor.hpp
@@ -124,10 +124,6 @@ struct MaterialInteractor {
     }
   }
 
-  /// Material interaction has no pure observer.
-  template <typename propagator_state_t>
-  void operator()(propagator_state_t& /*state*/) const {}
-
  private:
   /// @brief This function records the material effect
   ///

diff --git a/Core/include/Acts/Propagator/SurfaceCollector.hpp b/Core/include/Acts/Propagator/SurfaceCollector.hpp
@@ -107,14 +107,6 @@ struct SurfaceCollector {
                    << state.navigation.currentSurface->geometryId());
     }
   }
-
-  /// Pure observer interface
-  /// - this does not apply to the surface collector
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t& /*state*/, const stepper_t& /*unused*/,
-                  const navigator_t& /*navigator*/,
-                  const Logger& /*logger*/) const {}
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Propagator/VolumeCollector.hpp b/Core/include/Acts/Propagator/VolumeCollector.hpp
@@ -117,14 +117,6 @@ struct VolumeCollector {
       }
     }
   }
-
-  /// Pure observer interface
-  /// - this does not apply to the volume collector
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t& /*state*/, const stepper_t& /*unused*/,
-                  const navigator_t& /*navigator*/,
-                  const Logger& /*logger*/) const {}
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Propagator/detail/SteppingLogger.hpp b/Core/include/Acts/Propagator/detail/SteppingLogger.hpp
@@ -80,14 +80,6 @@ struct SteppingLogger {
     step.volume = state.navigation.currentVolume;
     result.steps.push_back(std::move(step));
   }
-
-  /// Pure observer interface
-  /// - this does not apply to the logger
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t& /*unused*/, const stepper_t& /*unused*/,
-                  const navigator_t& /*navigator*/,
-                  const Logger& /*logger*/) const {}
 };
 
 }  // namespace detail

diff --git a/Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp b/Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp
@@ -200,13 +200,6 @@ struct SimulationActor {
                    after.absoluteMomentum(), after.time());
   }
 
-  /// Pure observer interface. Does not apply to the Fatras simulator.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t & /*state*/, const stepper_t & /*stepper*/,
-                  const navigator_t & /*navigator*/,
-                  const Acts::Logger & /*logger*/) const {}
-
   /// Construct the current particle state from the stepper state.
   template <typename stepper_t>
   Particle makeParticle(const Particle &previous, const stepper_t &stepper,

diff --git a/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp
@@ -87,21 +87,6 @@ struct StepWiseActor {
       result.finalized = true;
     }
   }
-
-  /// @brief Kalman sequence operation - void operation
-  ///
-  /// @tparam propagator_state_t is the type of Propagagor state
-  /// @tparam stepper_t Type of the stepper
-  /// @tparam navigator_t Type of the navigator
-  ///
-  /// @param state is the mutable propagator state object
-  /// @param stepper Stepper used by the propagation
-  /// @param navigator Navigator used by the propagation
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-                  const navigator_t& /*navigator*/,
-                  const Logger& /*logger*/) const {}
 };
 
 ///

diff --git a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
@@ -56,11 +56,6 @@ struct PerpendicularMeasure {
                   const navigator_t& /*navigator*/, result_type& result) const {
     result.distance = perp(stepper.position(state.stepping));
   }
-
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-                  const navigator_t& /*navigator*/) const {}
 };
 
 /// An observer that measures the perpendicular distance
@@ -104,12 +99,6 @@ struct SurfaceObserver {
       }
     }
   }
-
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  void operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-                  const navigator_t& /*navigator*/,
-                  const Logger& /*logger*/) const {}
 };
 
 // Global definitions