Skip to content

Default mat.corr. is with LUT, fall-back to TGeo if LUT is not set #5118

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
shahor02 merged 1 commit into from
Jan 4, 2021
Merged

Default mat.corr. is with LUT, fall-back to TGeo if LUT is not set #5118

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
16 changes: 8 additions & 8 deletions Detectors/Base/include/DetectorsBase/Propagator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,38 +64,38 @@ class Propagator
static constexpr float MAX_STEP = 2.0f;

GPUd() bool PropagateToXBxByBz(o2::track::TrackParCov& track, float x,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
o2::track::TrackLTIntegral* tofInfo = nullptr, int signCorr = 0) const;

GPUd() bool PropagateToXBxByBz(o2::track::TrackPar& track, float x,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
o2::track::TrackLTIntegral* tofInfo = nullptr, int signCorr = 0) const;

GPUd() bool propagateToX(o2::track::TrackParCov& track, float x, float bZ,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
o2::track::TrackLTIntegral* tofInfo = nullptr, int signCorr = 0) const;

GPUd() bool propagateToX(o2::track::TrackPar& track, float x, float bZ,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxSnp = MAX_SIN_PHI, float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
o2::track::TrackLTIntegral* tofInfo = nullptr, int signCorr = 0) const;

GPUd() bool propagateToDCA(const o2::dataformats::VertexBase& vtx, o2::track::TrackParCov& track, float bZ,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
o2::dataformats::DCA* dcaInfo = nullptr, o2::track::TrackLTIntegral* tofInfo = nullptr,
int signCorr = 0, float maxD = 999.f) const;

GPUd() bool propagateToDCABxByBz(const o2::dataformats::VertexBase& vtx, o2::track::TrackParCov& track,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
o2::dataformats::DCA* dcaInfo = nullptr, o2::track::TrackLTIntegral* tofInfo = nullptr,
int signCorr = 0, float maxD = 999.f) const;

GPUd() bool propagateToDCA(const o2::math_utils::Point3D<float>& vtx, o2::track::TrackPar& track, float bZ,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
gpu::gpustd::array<float, 2>* dca = nullptr, o2::track::TrackLTIntegral* tofInfo = nullptr,
int signCorr = 0, float maxD = 999.f) const;

GPUd() bool propagateToDCABxByBz(const o2::math_utils::Point3D<float>& vtx, o2::track::TrackPar& track,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrTGeo,
float maxStep = MAX_STEP, MatCorrType matCorr = MatCorrType::USEMatCorrLUT,
gpu::gpustd::array<float, 2>* dca = nullptr, o2::track::TrackLTIntegral* tofInfo = nullptr,
int signCorr = 0, float maxD = 999.f) const;

Expand Down
2 changes: 1 addition & 1 deletion Detectors/Base/src/Propagator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ GPUd() bool Propagator::propagateToDCABxByBz(const math_utils::Point3D<float>& v
GPUd() MatBudget Propagator::getMatBudget(Propagator::MatCorrType corrType, const math_utils::Point3D<float>& p0, const math_utils::Point3D<float>& p1) const
{
#if !defined(GPUCA_STANDALONE) && !defined(GPUCA_GPUCODE)
if (corrType == MatCorrType::USEMatCorrTGeo) {
if (corrType == MatCorrType::USEMatCorrTGeo || !mMatLUT) {
return GeometryManager::meanMaterialBudget(p0, p1);
}
#endif
Expand Down