rebase

acts-project · Apr 13, 2020 · 5064e46 · 5064e46
1 parent b46074b
commit 5064e46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Core/include/Acts/TrackFinder/CombinatorialKalmanFilter.hpp b/Core/include/Acts/TrackFinder/CombinatorialKalmanFilter.hpp
@@ -23,8 +23,8 @@
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/DirectNavigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/StandardAborters.hpp"
 #include "Acts/Propagator/detail/PointwiseMaterialInteraction.hpp"
-#include "Acts/Propagator/detail/StandardAborters.hpp"
 #include "Acts/TrackFinder/CombinatorialKalmanFilterError.hpp"
 #include "Acts/TrackFinder/detail/VoidTrackFinderComponents.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
@@ -999,7 +999,7 @@ class CombinatorialKalmanFilter {
     calibrator_t m_calibrator;
 
     /// The Surface beeing
-    detail::SurfaceReached targetReached;
+    SurfaceReached targetReached;
   };
 
   template <typename source_link_t, typename parameters_t>

diff --git a/Tests/UnitTests/Core/TrackFinder/CombinatorialKalmanFilterTests.cpp b/Tests/UnitTests/Core/TrackFinder/CombinatorialKalmanFilterTests.cpp
@@ -24,13 +24,13 @@
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
+#include "Acts/Propagator/DebugOutputActor.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/StandardAborters.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
 #include "Acts/Propagator/SurfaceCollector.hpp"
-#include "Acts/Propagator/detail/DebugOutputActor.hpp"
-#include "Acts/Propagator/detail/StandardAborters.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
@@ -74,7 +74,7 @@ using ElementResolution = std::vector<Resolution>;
 using VolumeResolution = std::map<GeometryID::Value, ElementResolution>;
 using DetectorResolution = std::map<GeometryID::Value, VolumeResolution>;
 
-using DebugOutput = detail::DebugOutputActor;
+using DebugOutput = DebugOutputActor;
 
 std::normal_distribution<double> gauss(0., 1.);
 std::default_random_engine generator(42);
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE(comb_kalman_filter_zero_field) {
 
   // Create action list for the measurement creation
   using MeasurementActions = ActionList<MeasurementCreator, DebugOutput>;
-  using MeasurementAborters = AbortList<detail::EndOfWorldReached>;
+  using MeasurementAborters = AbortList<EndOfWorldReached>;
 
   auto pixelResX = Resolution(eLOC_0, 25_um);
   auto pixelResY = Resolution(eLOC_1, 50_um);