refactor: Factorize GX2F delta param calculation (#2774)

This allows compiling the fairly expensive `colPivHouseholderQr` expression to be compiled in a separate translation unit.
acts-project · Dec 6, 2023 · 12de1e2 · 12de1e2
1 parent a8a0576
commit 12de1e2
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 14 deletions.
diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
@@ -287,6 +287,9 @@ void collector(typename traj_t::TrackStateProxy& trackStateProxy,
   }
 }
 
+BoundVector calculateDeltaParams(bool zeroField, const BoundMatrix& aMatrix,
+                                 const BoundVector& bVector);
+
 /// Global Chi Square fitter (GX2F) implementation.
 ///
 /// @tparam propagator_t Type of the propagation class
@@ -718,20 +721,8 @@ class Gx2Fitter {
       }
 
       // calculate delta params [a] * delta = b
-      deltaParams = BoundVector::Zero();
-      if (gx2fOptions.zeroField) {
-        constexpr std::size_t reducedMatrixSize = 4;
-        deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
-            aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
-                .colPivHouseholderQr()
-                .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
-      } else {
-        constexpr std::size_t reducedMatrixSize = 5;
-        deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
-            aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
-                .colPivHouseholderQr()
-                .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
-      }
+      deltaParams =
+          calculateDeltaParams(gx2fOptions.zeroField, aMatrix, bVector);
 
       ACTS_VERBOSE("aMatrix:\n"
                    << aMatrix << "\n"
@@ -822,5 +813,6 @@ class Gx2Fitter {
     return track;
   }
 };
+
 }  // namespace Experimental
 }  // namespace Acts
diff --git a/Core/src/TrackFitting/CMakeLists.txt b/Core/src/TrackFitting/CMakeLists.txt
@@ -9,4 +9,5 @@ target_sources(
     GsfUtils.cpp
     BetheHeitlerApprox.cpp
     GsfMixtureReduction.cpp
+    GlobalChiSquareFitter.cpp
 )
diff --git a/Core/src/TrackFitting/GlobalChiSquareFitter.cpp b/Core/src/TrackFitting/GlobalChiSquareFitter.cpp
@@ -0,0 +1,34 @@
+// This file is part of the Acts project.
+//
+// Copyright (C) 2023 CERN for the benefit of the Acts project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include "Acts/TrackFitting/GlobalChiSquareFitter.hpp"
+
+#include "Acts/Definitions/TrackParametrization.hpp"
+
+namespace Acts::Experimental {
+
+BoundVector calculateDeltaParams(bool zeroField, const BoundMatrix& aMatrix,
+                                 const BoundVector& bVector) {
+  BoundVector deltaParams = BoundVector::Zero();
+  if (zeroField) {
+    constexpr std::size_t reducedMatrixSize = 4;
+    deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
+        aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
+            .colPivHouseholderQr()
+            .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
+  } else {
+    constexpr std::size_t reducedMatrixSize = 5;
+    deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
+        aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
+            .colPivHouseholderQr()
+            .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
+  }
+
+  return deltaParams;
+}
+}  // namespace Acts::Experimental