refactor!: Remove CovarianceTransport (#2781)

This seems not to be used anywhere other than benchmarks Breaking as this is part of the public interface
acts-project · Dec 16, 2023 · 7c9479d · 7c9479d
1 parent 66908fc
commit 7c9479d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 470 deletions.
diff --git a/Core/src/Propagator/CMakeLists.txt b/Core/src/Propagator/CMakeLists.txt
@@ -1,7 +1,6 @@
 target_sources(
   ActsCore
   PRIVATE
-    CovarianceTransport.cpp
     EigenStepperError.cpp
     MultiStepperError.cpp
     PropagatorError.cpp

diff --git a/Core/src/Propagator/CovarianceTransport.cpp b/Core/src/Propagator/CovarianceTransport.cpp
diff --git a/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp b/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp
@@ -18,7 +18,6 @@
 #include "Acts/EventData/detail/TransformationBoundToFree.hpp"
 #include "Acts/EventData/detail/TransformationFreeToBound.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Propagator/CovarianceTransport.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Logger.hpp"

diff --git a/Plugins/EDM4hep/src/EDM4hepUtil.cpp b/Plugins/EDM4hep/src/EDM4hepUtil.cpp
@@ -8,6 +8,7 @@
 
 #include "Acts/Plugins/EDM4hep/EDM4hepUtil.hpp"
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
@@ -144,25 +145,9 @@ Parameters convertTrackParametersToEdm4hep(const Acts::GeometryContext& gctx,
 
   // Only run covariance conversion if we have a covariance input
   if (params.covariance()) {
-    auto boundToFree =
-        refSurface->boundToFreeJacobian(gctx, params.parameters());
-    Acts::FreeMatrix freeCov =
-        boundToFree * params.covariance().value() * boundToFree.transpose();
-
-    // ensure we have free pars
-    if (!freePars.has_value()) {
-      freePars = makeFreePars();
-    }
-
-    Acts::CovarianceCache covCache{freePars.value(), freeCov};
-    auto [varNewCov, varNewJac] = Acts::transportCovarianceToBound(
-        gctx, *refSurface, freePars.value(), covCache);
-    auto targetCov = std::get<Acts::BoundSquareMatrix>(varNewCov);
-
     Acts::ActsSquareMatrix<6> J = jacobianToEdm4hep(
         targetPars[eBoundTheta], targetPars[eBoundQOverP], Bz);
-    Acts::ActsSquareMatrix<6> cIn = targetCov.template topLeftCorner<6, 6>();
-    result.covariance = J * cIn * J.transpose();
+    result.covariance = J * params.covariance().value() * J.transpose();
   }
 
   result.values[0] = targetPars[Acts::eBoundLoc0];

diff --git a/Tests/Benchmarks/CMakeLists.txt b/Tests/Benchmarks/CMakeLists.txt
@@ -23,7 +23,6 @@ endmacro()
 add_benchmark(AtlasStepper AtlasStepperBenchmark.cpp)
 add_benchmark(BoundaryCheck BoundaryCheckBenchmark.cpp)
 add_benchmark(BinUtility BinUtilityBenchmark.cpp)
-add_benchmark(CovarianceTransport CovarianceTransportBenchmark.cpp)
 add_benchmark(EigenStepper EigenStepperBenchmark.cpp)
 add_benchmark(SolenoidField SolenoidFieldBenchmark.cpp)
 add_benchmark(SurfaceIntersection SurfaceIntersectionBenchmark.cpp)

diff --git a/Tests/Benchmarks/CovarianceTransportBenchmark.cpp b/Tests/Benchmarks/CovarianceTransportBenchmark.cpp
diff --git a/Tests/UnitTests/Core/Propagator/CMakeLists.txt b/Tests/UnitTests/Core/Propagator/CMakeLists.txt
@@ -2,7 +2,6 @@ add_unittest(AtlasStepper AtlasStepperTests.cpp)
 add_unittest(Auctioneer AuctioneerTests.cpp)
 add_unittest(ConstrainedStep ConstrainedStepTests.cpp)
 add_unittest(CovarianceEngine CovarianceEngineTests.cpp)
-add_unittest(CovarianceTransport CovarianceTransportTests.cpp)
 add_unittest(DirectNavigator DirectNavigatorTests.cpp)
 add_unittest(Extrapolator ExtrapolatorTests.cpp)
 add_unittest(Jacobian JacobianTests.cpp)