Skip to content

Commit

Permalink
Merge branch 'main' into minor-interactions-precalc-constant
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Aug 21, 2023
2 parents adf0d4d + a2ddfc9 commit 17bb728
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Core/include/Acts/Vertexing/KalmanVertexTrackUpdater.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ void Acts::KalmanVertexTrackUpdater::update(TrackAtVertex<input_track_t>& track,
const ActsMatrix<5, 3> posJac = linTrack.positionJacobian.block<5, 3>(0, 0);
const ActsMatrix<5, 3> momJac = linTrack.momentumJacobian.block<5, 3>(0, 0);
const ActsVector<5> trkParams = linTrack.parametersAtPCA.head<5>();
// TODO we could use `linTrack.weightAtPCA` but only if we would use time
const ActsSymMatrix<5> trkParamWeight =
linTrack.weightAtPCA.block<5, 5>(0, 0);
linTrack.covarianceAtPCA.block<5, 5>(0, 0).inverse();

// Calculate S matrix
ActsSymMatrix<3> sMat =
Expand Down
6 changes: 4 additions & 2 deletions Core/include/Acts/Vertexing/KalmanVertexUpdater.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ void Acts::KalmanVertexUpdater::updatePosition(
linTrack.momentumJacobian.block<5, 3>(0, 0); // B_k in comments below
const ActsVector<5> trkParams = linTrack.parametersAtPCA.head<5>();
const ActsVector<5> constTerm = linTrack.constantTerm.head<5>();
// TODO we could use `linTrack.weightAtPCA` but only if we would use time
const ActsSymMatrix<5> trkParamWeight =
linTrack.weightAtPCA.block<5, 5>(0, 0);
linTrack.covarianceAtPCA.block<5, 5>(0, 0).inverse();

// Vertex to be updated
const Vector3& oldVtxPos = vtx.position();
Expand Down Expand Up @@ -119,8 +120,9 @@ double Acts::KalmanVertexUpdater::detail::trackParametersChi2(
const ActsMatrix<5, 3> momJac = linTrack.momentumJacobian.block<5, 3>(0, 0);
const ActsVector<5> trkParams = linTrack.parametersAtPCA.head<5>();
const ActsVector<5> constTerm = linTrack.constantTerm.head<5>();
// TODO we could use `linTrack.weightAtPCA` but only if we would use time
const ActsSymMatrix<5> trkParamWeight =
linTrack.weightAtPCA.block<5, 5>(0, 0);
linTrack.covarianceAtPCA.block<5, 5>(0, 0).inverse();

const ActsVector<5> jacVtx = posJac * matrixCache.newVertexPos;

Expand Down

0 comments on commit 17bb728

Please sign in to comment.