feat(gx2f): support n-dimensional measurements

Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp

@@ -828,10 +828,18 @@ class Gx2Fitter {
  } else if (measDim == 2) {
  addToGx2fSums<2>(aMatrix, bVector, chi2sum, jacobianFromStart,
  trackState, *m_addToSumLogger);
+ } else if (measDim == 3) {
+ addToGx2fSums<3>(aMatrix, bVector, chi2sum, jacobianFromStart,
+ trackState, *m_addToSumLogger);
+ } else if (measDim == 4) {
+ addToGx2fSums<4>(aMatrix, bVector, chi2sum, jacobianFromStart,
+ trackState, *m_addToSumLogger);
+ } else if (measDim == 5) {
+ addToGx2fSums<5>(aMatrix, bVector, chi2sum, jacobianFromStart,
+ trackState, *m_addToSumLogger);
  } else {
- ACTS_ERROR("Can not process state with measurement with "
- << measDim << " dimensions.")
- countNdf -= measDim;
+ addToGx2fSums<6>(aMatrix, bVector, chi2sum, jacobianFromStart,
+ trackState, *m_addToSumLogger);
  }
  } else if (typeFlags.test(TrackStateFlag::HoleFlag)) {
  // Handle hole
@@ -910,7 +918,7 @@ class Gx2Fitter {
  // Calculate covariance of the fitted parameters with inverse of [a]
  BoundMatrix fullCovariancePredicted = BoundMatrix::Identity();
  bool aMatrixIsInvertible = false;
- if (gx2fOptions.zeroField) {
+ if (aMatrix(4, 4) == 0) {
  constexpr std::size_t reducedMatrixSize = 4;
 
  auto safeReducedCovariance = safeInverse(
@@ -921,9 +929,20 @@ class Gx2Fitter {
  .topLeftCorner<reducedMatrixSize, reducedMatrixSize>() =
  *safeReducedCovariance;
  }
- } else {
+ } else if (aMatrix(5, 5) == 0) {
  constexpr std::size_t reducedMatrixSize = 5;
 
+ auto safeReducedCovariance = safeInverse(
+ aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>().eval());
+ if (safeReducedCovariance) {
+ aMatrixIsInvertible = true;
+ fullCovariancePredicted
+ .topLeftCorner<reducedMatrixSize, reducedMatrixSize>() =
+ *safeReducedCovariance;
+ }
+ } else {
+ constexpr std::size_t reducedMatrixSize = 6;
+
  auto safeReducedCovariance = safeInverse(
  aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>().eval());
  if (safeReducedCovariance) {

Core/src/TrackFitting/GlobalChiSquareFitter.cpp

@@ -12,21 +12,27 @@
 
 namespace Acts::Experimental {
 
-BoundVector calculateDeltaParams(bool zeroField, const BoundMatrix& aMatrix,
+BoundVector calculateDeltaParams(bool /*zeroField*/, const BoundMatrix& aMatrix,
  const BoundVector& bVector) {
  BoundVector deltaParams = BoundVector::Zero();
- if (zeroField) {
+ if (aMatrix(4, 4) == 0) {
  constexpr std::size_t reducedMatrixSize = 4;
  deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
  aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
  .colPivHouseholderQr()
  .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
- } else {
+ } else if (aMatrix(5, 5) == 0) {
  constexpr std::size_t reducedMatrixSize = 5;
  deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
  aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
  .colPivHouseholderQr()
  .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
+ } else {
+ constexpr std::size_t reducedMatrixSize = 6;
+ deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
+ aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
+ .colPivHouseholderQr()
+ .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
  }
 
  return deltaParams;