Skip to content

TRK: add nELossSteps #15703

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
f3sch merged 1 commit into from
Aug 21, 2026
+35 −13
Merged

TRK: add nELossSteps #15703

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
7 changes: 7 additions & 0 deletions DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ class TrackParametrization
GPUd() value_t getE() const;
GPUdi() static value_t getdEdxBB(value_t betagamma) { return BetheBlochSolid(betagamma); }
GPUdi() static value_t getdEdxBBOpt(value_t betagamma) { return BetheBlochSolidOpt(betagamma); }

GPUdi() int nELossSteps(value_T dE, value_T ekin) const noexcept
{
const int n = 1 + int(gpu::CAMath::Abs(dE) / ekin * ELoss2EKinThreshInv);
return n > MaxELossIter ? MaxELossIter : n;
}
GPUd() int getELossSteps(value_t xrho, bool anglecorr) const;
GPUdi() static value_t getBetheBlochSolidDerivativeApprox(value_T dedx, value_T bg) { return BetheBlochSolidDerivative(dedx, bg); }

GPUd() value_t getTheta() const;
Expand Down
31 changes: 26 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 @@ -867,6 +867,30 @@ GPUd() bool TrackParametrization<value_T>::getXatLabR(value_t r, value_t& x, val
return true;
}

//______________________________________________
template <typename value_T>
GPUd() int TrackParametrization<value_T>::getELossSteps(value_t xrho, bool anglecorr) const
{
// Copied from correctForMaterial before entering its energy-loss loop
const value_t m = getPID().getMass();
if (!(m > 0) || xrho == 0.f) {
return 0; // correctForMaterial skips the energy-loss block entirely
}
if (anglecorr) {
const value_t csp2 = (1.f - getSnp()) * (1.f + getSnp()); // cos(phi)^2
const value_t cst2I = (1.f + getTgl() * getTgl()); // 1/cos(lambda)^2
xrho *= gpu::CAMath::Sqrt(cst2I / csp2);
}
const value_t p = getP(), massInv = 1.f / m;
const value_t e = gpu::CAMath::Sqrt(p * p + getPID().getMass2()), ekin = e - m;
value_t dedx = getdEdxBBOpt(p * massInv);
const int charge2 = getAbsCharge() * getAbsCharge();
if (charge2 != 1) {
dedx *= charge2;
}
return nELossSteps(dedx * xrho, ekin);
}

//______________________________________________
template <typename value_T>
GPUd() bool TrackParametrization<value_T>::correctForELoss(value_t xrho, bool anglecorr)
Expand All @@ -891,7 +915,7 @@ GPUd() bool TrackParametrization<value_T>::correctForELoss(value_t xrho, bool an
xrho *= angle;
}
int charge2 = getAbsCharge() * getAbsCharge();
value_t p = getP(), p0 = p, p2 = p * p, e2 = p2 + getPID().getMass2(), massInv = 1. / m, bg = p * massInv;
value_t p = getP(), p0 = p, p2 = p * p, e2 = p2 + getPID().getMass2(), massInv = 1.f / m, bg = p * massInv;
value_t e = gpu::CAMath::Sqrt(e2), ekin = e - m, dedx = getdEdxBBOpt(bg);
#ifdef _BB_NONCONST_CORR_
value_t dedxDer = 0., dedx1 = dedx;
Expand All @@ -900,10 +924,7 @@ GPUd() bool TrackParametrization<value_T>::correctForELoss(value_t xrho, bool an
dedx *= charge2;
}
value_t dE = dedx * xrho;
int na = 1 + int(gpu::CAMath::Abs(dE) / ekin * ELoss2EKinThreshInv);
if (na > MaxELossIter) {
na = MaxELossIter;
}
int na = nELossSteps(dE, ekin);
if (na > 1) {
dE /= na;
xrho /= na;
Expand Down
10 changes: 2 additions & 8 deletions DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,10 +1438,7 @@ GPUd() bool TrackParametrizationWithError<value_T>::correctForMaterial(value_t x
dedx *= charge2;
}
value_t dE = dedx * xrho;
int na = 1 + int(gpu::CAMath::Abs(dE) / ekin * ELoss2EKinThreshInv);
if (na > MaxELossIter) {
na = MaxELossIter;
}
int na = this->nELossSteps(dE, ekin);
if (na > 1) {
dE /= na;
xrho /= na;
Expand Down Expand Up @@ -1573,10 +1570,7 @@ GPUd() bool TrackParametrizationWithError<value_T>::correctForMaterial(TrackPara
dedx *= charge2;
}
value_t dE = dedx * xrho;
int na = 1 + int(gpu::CAMath::Abs(dE) / ekin * ELoss2EKinThreshInv);
if (na > MaxELossIter) {
na = MaxELossIter;
}
int na = this->nELossSteps(dE, ekin);
if (na > 1) {
dE /= na;
xrho /= na;
Expand Down
Loading