Merge branch 'main' into feat-refine-dd4hep-building

acts-project · Nov 17, 2023 · 0358d4c · 0358d4c
2 parents 42256af + 394192a
commit 0358d4c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
@@ -83,6 +83,7 @@ struct Gx2FitterExtensions {
     calibrator.template connect<&detail::voidFitterCalibrator<traj_t>>();
     updater.template connect<&detail::voidFitterUpdater<traj_t>>();
     outlierFinder.template connect<&detail::voidOutlierFinder<traj_t>>();
+    surfaceAccessor.connect<&detail::voidSurfaceAccessor>();
   }
 };
 

diff --git a/Core/include/Acts/TrackFitting/GsfOptions.hpp b/Core/include/Acts/TrackFitting/GsfOptions.hpp
@@ -82,6 +82,9 @@ struct GsfExtensions {
     calibrator.template connect<&detail::voidFitterCalibrator<traj_t>>();
     updater.template connect<&detail::voidFitterUpdater<traj_t>>();
     outlierFinder.template connect<&detail::voidOutlierFinder<traj_t>>();
+    surfaceAccessor.connect<&detail::voidSurfaceAccessor>();
+    mixtureReducer
+        .template connect<&detail::voidComponentReducer<GsfComponent>>();
   }
 };
 

diff --git a/Core/include/Acts/TrackFitting/KalmanFitter.hpp b/Core/include/Acts/TrackFitting/KalmanFitter.hpp
@@ -107,6 +107,7 @@ struct KalmanFitterExtensions {
     outlierFinder.template connect<&detail::voidOutlierFinder<traj_t>>();
     reverseFilteringLogic
         .template connect<&detail::voidReverseFilteringLogic<traj_t>>();
+    surfaceAccessor.connect<&detail::voidSurfaceAccessor>();
   }
 };
 

diff --git a/Core/include/Acts/TrackFitting/detail/VoidFitterComponents.hpp b/Core/include/Acts/TrackFitting/detail/VoidFitterComponents.hpp
@@ -63,4 +63,11 @@ bool voidReverseFilteringLogic(
 inline const Surface* voidSurfaceAccessor(const SourceLink& /*sourceLink*/) {
   throw std::runtime_error{"voidSurfaceAccessor should not ever execute"};
 }
+
+template <typename component_t>
+void voidComponentReducer(std::vector<component_t>& /*components*/,
+                          std::size_t /*n*/, const Surface& /*surface*/) {
+  throw std::runtime_error{"voidComponentReducer should not ever execute"};
+}
+
 }  // namespace Acts::detail