Skip to content

Commit 8572af8

Browse files
authored
Add quiet predictedChi2 call (#13548)
1 parent 4138baf commit 8572af8

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrizationWithError.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,17 @@ class TrackParametrizationWithError : public TrackParametrization<value_T>
9393
GPUd() bool propagateToDCA(const o2::dataformats::VertexBase& vtx, value_t b, o2::dataformats::DCA* dca = nullptr, value_t maxD = 999.f);
9494
GPUd() void invert();
9595
GPUd() value_t getPredictedChi2(const dim2_t& p, const dim3_t& cov) const;
96-
GPUd() value_t getPredictedChi2Unchecked(const dim2_t& p, const dim3_t& cov) const;
96+
GPUd() value_t getPredictedChi2Quiet(const dim2_t& p, const dim3_t& cov) const;
9797
GPUd() value_t getPredictedChi2(const value_t* p, const value_t* cov) const;
98-
GPUd() value_t getPredictedChi2Unchecked(const value_t* p, const value_t* cov) const;
98+
GPUd() value_t getPredictedChi2Quiet(const value_t* p, const value_t* cov) const;
9999

100100
template <typename T>
101101
GPUd() value_t getPredictedChi2(const BaseCluster<T>& p) const;
102102

103103
void buildCombinedCovMatrix(const TrackParametrizationWithError& rhs, MatrixDSym5& cov) const;
104104
value_t getPredictedChi2(const TrackParametrizationWithError& rhs, MatrixDSym5& covToSet) const;
105105
GPUd() value_t getPredictedChi2(const TrackParametrizationWithError& rhs) const;
106+
GPUd() value_t getPredictedChi2Quiet(const TrackParametrizationWithError& rhs) const;
106107
bool update(const TrackParametrizationWithError& rhs, const MatrixDSym5& covInv);
107108
bool update(const TrackParametrizationWithError& rhs);
108109

@@ -322,9 +323,9 @@ GPUdi() auto TrackParametrizationWithError<value_T>::getPredictedChi2(const dim2
322323

323324
//______________________________________________
324325
template <typename value_T>
325-
GPUdi() auto TrackParametrizationWithError<value_T>::getPredictedChi2Unchecked(const dim2_t& p, const dim3_t& cov) const -> value_t
326+
GPUdi() auto TrackParametrizationWithError<value_T>::getPredictedChi2Quiet(const dim2_t& p, const dim3_t& cov) const -> value_t
326327
{
327-
return getPredictedChi2Unchecked(p.data(), cov.data());
328+
return getPredictedChi2Quiet(p.data(), cov.data());
328329
}
329330

330331
//______________________________________________

DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ GPUd() auto TrackParametrizationWithError<value_T>::getPredictedChi2(const value
736736

737737
//______________________________________________
738738
template <typename value_T>
739-
GPUd() auto TrackParametrizationWithError<value_T>::getPredictedChi2Unchecked(const value_t* p, const value_t* cov) const -> value_t
739+
GPUd() auto TrackParametrizationWithError<value_T>::getPredictedChi2Quiet(const value_t* p, const value_t* cov) const -> value_t
740740
{
741741
// Estimate the chi2 of the space point "p" with the cov. matrix "cov"
742742
auto sdd = static_cast<double>(getSigmaY2()) + static_cast<double>(cov[0]);

Detectors/ITSMFT/ITS/tracking/src/TrackerTraits.cxx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ void TrackerTraits::computeLayerCells(const int iteration)
355355
break;
356356
}
357357

358-
auto predChi2{track.getPredictedChi2(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)};
358+
auto predChi2{track.getPredictedChi2Quiet(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)};
359359
if (!track.o2::track::TrackParCov::update(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)) {
360360
break;
361361
}
@@ -536,7 +536,7 @@ void TrackerTraits::processNeighbours(int iLayer, int iLevel, const std::vector<
536536
}
537537
}
538538

539-
auto predChi2{seed.getPredictedChi2(trHit.positionTrackingFrame, trHit.covarianceTrackingFrame)};
539+
auto predChi2{seed.getPredictedChi2Quiet(trHit.positionTrackingFrame, trHit.covarianceTrackingFrame)};
540540
if ((predChi2 > mTrkParams[0].MaxChi2ClusterAttachment) || predChi2 < 0.f) {
541541
CA_DEBUGGER(failed[3]++);
542542
continue;
@@ -781,7 +781,7 @@ void TrackerTraits::findShortPrimaries()
781781
float pvRes{mTrkParams[0].PVres / o2::gpu::CAMath::Sqrt(float(pvs[iV].getNContributors()))};
782782
const float posVtx[2]{0.f, pvs[iV].getZ()};
783783
const float covVtx[3]{pvRes, 0.f, pvRes};
784-
float chi2 = temporaryTrack.getPredictedChi2(posVtx, covVtx);
784+
float chi2 = temporaryTrack.getPredictedChi2Quiet(posVtx, covVtx);
785785
if (chi2 < bestChi2) {
786786
if (!temporaryTrack.track::TrackParCov::update(posVtx, covVtx)) {
787787
continue;
@@ -837,7 +837,7 @@ bool TrackerTraits::fitTrack(TrackITSExt& track, int start, int end, int step, f
837837
}
838838
}
839839

840-
auto predChi2{track.getPredictedChi2(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)};
840+
auto predChi2{track.getPredictedChi2Quiet(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)};
841841
if ((nCl >= 3 && predChi2 > chi2clcut) || predChi2 < 0.f) {
842842
return false;
843843
}
@@ -932,7 +932,7 @@ bool TrackerTraits::trackFollowing(TrackITSExt* track, int rof, bool outward, co
932932
continue;
933933
}
934934

935-
auto predChi2{tbuParams.getPredictedChi2(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)};
935+
auto predChi2{tbuParams.getPredictedChi2Quiet(trackingHit.positionTrackingFrame, trackingHit.covarianceTrackingFrame)};
936936
if (predChi2 >= track->getChi2() * mTrkParams[iteration].NSigmaCut) {
937937
continue;
938938
}

0 commit comments

Comments
 (0)