Skip to content

GPU TPC: When running cluster rejection based on interpolation, also reject during update with current cluster position #14188

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

Merged
davidrohr merged 1 commit into from
Apr 16, 2025
Merged

GPU TPC: When running cluster rejection based on interpolation, also reject during update with current cluster position #14188

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
34 changes: 17 additions & 17 deletions GPU/GPUTracking/Merger/GPUTPCGMPropagator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ GPUd() int32_t GPUTPCGMPropagator::Update(float posY, float posZ, int32_t iRow,
return 0;
}

return Update(posY, posZ, clusterState, rejectChi2 == rejectDirect, err2Y, err2Z, &param);
return Update(posY, posZ, clusterState, rejectChi2 == rejectDirect || rejectChi2 == rejectInterReject, err2Y, err2Z, &param);
}

GPUd() int32_t GPUTPCGMPropagator::InterpolateReject(const GPUParam& GPUrestrict() param, float posY, float posZ, int16_t clusterState, int8_t rejectChi2, gputpcgmmergertypes::InterpolationErrorHit* inter, float err2Y, float err2Z)
Expand All @@ -704,7 +704,7 @@ GPUd() int32_t GPUTPCGMPropagator::InterpolateReject(const GPUParam& GPUrestrict
inter->errorY = mC[0];
inter->errorZ = mC[2];
} else if (rejectChi2 == rejectInterReject) {
float chiY, chiZ;
float chi2Y, chi2Z;
if (mFitInProjections || mT->NDF() <= 0) {
const float Iz0 = inter->posY - mP[0];
const float Iz1 = inter->posZ - mP[1];
Expand All @@ -721,8 +721,8 @@ GPUd() int32_t GPUTPCGMPropagator::InterpolateReject(const GPUParam& GPUrestrict
const float Jz1 = posZ - ImP1;
const float Jw0 = 1.f / (ImC0 + err2Y);
const float Jw2 = 1.f / (ImC2 + err2Z);
chiY = Jw0 * Jz0 * Jz0;
chiZ = Jw2 * Jz1 * Jz1;
chi2Y = Jw0 * Jz0 * Jz0;
chi2Z = Jw2 * Jz1 * Jz1;
} else {
const float Iz0 = inter->posY - mP[0];
const float Iz1 = inter->posZ - mP[1];
Expand Down Expand Up @@ -751,11 +751,11 @@ GPUd() int32_t GPUTPCGMPropagator::InterpolateReject(const GPUParam& GPUrestrict
Jw0 *= Jdet;
const float Jw1 = ImC1 * Jdet;
Jw2 *= Jdet;
chiY = CAMath::Abs((Jw0 * Jz0 + Jw1 * Jz1) * Jz0);
chiZ = CAMath::Abs((Jw1 * Jz0 + Jw2 * Jz1) * Jz1);
chi2Y = CAMath::Abs((Jw0 * Jz0 + Jw1 * Jz1) * Jz0);
chi2Z = CAMath::Abs((Jw1 * Jz0 + Jw2 * Jz1) * Jz1);
}
if (RejectCluster(chiY * param.rec.tpc.clusterRejectChi2TolleranceY, chiZ * param.rec.tpc.clusterRejectChi2TolleranceZ, clusterState)) { // TODO: Relative Pt resolution decreases slightly, why?
return updateErrorClusterRejected;
if (RejectCluster(chi2Y * param.rec.tpc.clusterRejectChi2TolleranceY, chi2Z * param.rec.tpc.clusterRejectChi2TolleranceZ, clusterState)) { // TODO: Relative Pt resolution decreases slightly, why?
return updateErrorClusterRejectedInInterpolation;
}
}
return 0;
Expand All @@ -771,13 +771,13 @@ GPUd() int32_t GPUTPCGMPropagator::Update(float posY, float posZ, int16_t cluste

const float z0 = posY - mP[0];
const float z1 = posZ - mP[1];
float w0, w1, w2, chiY, chiZ;
float w0, w1, w2, chi2Y, chi2Z;
if (mFitInProjections || mT->NDF() <= 0) {
w0 = 1.f / (err2Y + d00);
w1 = 0;
w2 = 1.f / (err2Z + d11);
chiY = w0 * z0 * z0;
chiZ = w2 * z1 * z1;
chi2Y = w0 * z0 * z0;
chi2Z = w2 * z1 * z1;
} else {
w0 = d11 + err2Z, w1 = d10, w2 = d00 + err2Y;
{ // Invert symmetric matrix
Expand All @@ -790,13 +790,13 @@ GPUd() int32_t GPUTPCGMPropagator::Update(float posY, float posZ, int16_t cluste
w1 = -w1 * det;
w2 = w2 * det;
}
chiY = CAMath::Abs((w0 * z0 + w1 * z1) * z0);
chiZ = CAMath::Abs((w1 * z0 + w2 * z1) * z1);
chi2Y = CAMath::Abs((w0 * z0 + w1 * z1) * z0);
chi2Z = CAMath::Abs((w1 * z0 + w2 * z1) * z1);
}
float dChi2 = chiY + chiZ;
// GPUInfo("hits %d chi2 %f, new %f %f (dy %f dz %f)", N, mChi2, chiY, chiZ, z0, z1);
if (rejectChi2 == 1 && RejectCluster(chiY * param->rec.tpc.clusterRejectChi2TolleranceY, chiZ * param->rec.tpc.clusterRejectChi2TolleranceZ, clusterState)) {
return updateErrorClusterRejected;
float dChi2 = chi2Y + chi2Z;
// GPUInfo("hits %d chi2 %f, new %f %f (dy %f dz %f)", N, mChi2, chi2Y, chi2Z, z0, z1);
if (rejectChi2 && RejectCluster(chi2Y * param->rec.tpc.clusterRejectChi2TolleranceY, chi2Z * param->rec.tpc.clusterRejectChi2TolleranceZ, clusterState)) {
return updateErrorClusterRejectedInUpdate;
}
mT->Chi2() += dChi2;
mT->NDF() += 2;
Expand Down
5 changes: 4 additions & 1 deletion GPU/GPUTracking/Merger/GPUTPCGMPropagator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ class GPUTPCGMPropagator
enum UpdateRetVal {
updateErrorFitFailed = -1,
updateErrorClusterRejected = 2,
updateErrorEdgeCluster = 3
updateErrorClusterRejectedDistance = 2,
updateErrorEdgeCluster = 3,
updateErrorClusterRejectedInInterpolation = 4,
updateErrorClusterRejectedInUpdate = 5
};
enum RejectChi2Mode {
rejectDirect = 1,
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger* GPUrestrict() merger, int32_
int32_t retVal;
float threshold = 3.f + (lastUpdateX >= 0 ? (CAMath::Abs(mX - lastUpdateX) / 2) : 0.f);
if (mNDF > 5 && (CAMath::Abs(yy - mP[0]) > threshold || CAMath::Abs(zz - mP[1]) > threshold)) {
retVal = GPUTPCGMPropagator::updateErrorClusterRejected;
retVal = GPUTPCGMPropagator::updateErrorClusterRejectedDistance;
} else {
int8_t rejectChi2 = attempt ? 0 : ((param.rec.tpc.mergerInterpolateErrors && CAMath::Abs(ihit - ihitMergeFirst) <= 1) ? (refit ? (GPUTPCGMPropagator::rejectInterFill + ((nWays - iWay) & 1)) : 0) : (allowModification && goodRows > 5));
#if EXTRACT_RESIDUALS == 1
Expand Down