Skip to content

Fix in the 3D field propagation final step #15109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahor02 wants to merge 1 commit into
base: dev
Choose a base branch
from
+11 −11
Open

Fix in the 3D field propagation final step #15109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions DataFormats/Reconstruction/src/TrackParametrization.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,14 @@ GPUd() bool TrackParametrization<value_T>::propagateParamTo(value_t xk, const di

// Do the final correcting step to the target plane (linear approximation)
value_t x = vecLab[0], y = vecLab[1], z = vecLab[2];
if (gpu::CAMath::Abs(dx) > constants::math::Almost0) {
if (gpu::CAMath::Abs(x - xk) > constants::math::Almost0) {
if (gpu::CAMath::Abs(vecLab[3]) < constants::math::Almost0) {
return false;
}
dx = xk - vecLab[0];
x += dx;
y += vecLab[4] / vecLab[3] * dx;
z += vecLab[5] / vecLab[3] * dx;
auto dxFin = xk - vecLab[0];
x += dxFin;
y += vecLab[4] / vecLab[3] * dxFin;
z += vecLab[5] / vecLab[3] * dxFin;
}

// Calculate the track parameters
Expand Down
12 changes: 6 additions & 6 deletions DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,14 +776,14 @@ GPUd() bool TrackParametrizationWithError<value_T>::propagateTo(value_t xk, cons

// Do the final correcting step to the target plane (linear approximation)
value_t x = vecLab[0], y = vecLab[1], z = vecLab[2];
if (gpu::CAMath::Abs(dx) > constants::math::Almost0) {
if (gpu::CAMath::Abs(x - xk) > constants::math::Almost0) {
if (gpu::CAMath::Abs(vecLab[3]) < constants::math::Almost0) {
return false;
}
dx = xk - vecLab[0];
x += dx;
y += vecLab[4] / vecLab[3] * dx;
z += vecLab[5] / vecLab[3] * dx;
auto dxFin = xk - vecLab[0];
x += dxFin;
y += vecLab[4] / vecLab[3] * dxFin;
z += vecLab[5] / vecLab[3] * dxFin;
}

// Calculate the track parameters
Expand Down Expand Up @@ -896,7 +896,7 @@ GPUd() bool TrackParametrizationWithError<value_T>::propagateTo(value_t xk, Trac

// Do the final correcting step to the target plane (linear approximation)
value_t x = vecLab[0], y = vecLab[1], z = vecLab[2];
if (gpu::CAMath::Abs(dx) > constants::math::Almost0) {
if (gpu::CAMath::Abs(x - xk) > constants::math::Almost0) {
if (gpu::CAMath::Abs(vecLab[3]) < constants::math::Almost0) {
return false;
}
Expand Down