From 8db315c25d91e422796b8323582f5d40a86b0a00 Mon Sep 17 00:00:00 2001
From: AJPfleger <alexander.julian.pfleger@cern.ch>
Date: Thu, 14 Nov 2024 11:22:25 +0100
Subject: [PATCH] clean up after conflict

---
 .../Acts/TrackFitting/GlobalChiSquareFitter.hpp  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
index d9bae40d795..8442071a23f 100644
--- a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
+++ b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
@@ -1483,9 +1483,9 @@ class Gx2Fitter {
       auto propagationResult = m_propagator.propagate(propagatorState);
 
       // Run the fitter
-      auto result = m_propagator.makeResult(std::move(propagatorState),
-                                                     propagationResult,
-                                                     propagatorOptions, false);
+      auto result =
+          m_propagator.makeResult(std::move(propagatorState), propagationResult,
+                                  propagatorOptions, false);
 
       if (!result.ok()) {
         ACTS_ERROR("Propagation failed: " << result.error());
@@ -1520,7 +1520,8 @@ class Gx2Fitter {
 
       // Count the material surfaces, to set up the system. In the multiple
       // scattering case, we need to extend our system.
-      const std::size_t nMaterialSurfaces = countMaterialStates(track, scatteringMap, *m_addToSumLogger);
+      const std::size_t nMaterialSurfaces =
+          countMaterialStates(track, scatteringMap, *m_addToSumLogger);
 
       // We need 6 dimensions for the bound parameters and 2 * nMaterialSurfaces
       // dimensions for the scattering angles.
@@ -1562,14 +1563,10 @@ class Gx2Fitter {
           extendedSystem.aMatrix().colPivHouseholderQr().solve(
               extendedSystem.bVector());
 
-      deltaParams = deltaParamsExtended.topLeftCorner<eBoundSize, 1>().eval();
-
       ACTS_VERBOSE("aMatrix:\n"
                    << extendedSystem.aMatrix() << "\n"
                    << "bVector:\n"
                    << extendedSystem.bVector() << "\n"
-                   << "deltaParams:\n"
-                   << deltaParams << "\n"
                    << "deltaParamsExtended:\n"
                    << deltaParamsExtended << "\n"
                    << "oldChi2sum = " << oldChi2sum << "\n"
@@ -1577,9 +1574,6 @@ class Gx2Fitter {
 
       chi2sum = extendedSystem.chi2();
 
-      // update params
-      params.parameters() += deltaParams;
-
       updateGx2fParams(params, deltaParamsExtended, nMaterialSurfaces,
                        scatteringMap, geoIdVector);
       ACTS_VERBOSE("Updated parameters: " << params.parameters().transpose());