Skip to content
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.

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

Option to make track covariance Pos-def in packedcandidate #39599

Merged
merged 8 commits into from
Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
4 changes: 4 additions & 0 deletions DataFormats/PatCandidates/interface/PackedCandidate.h
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,10 @@ namespace pat {
unpackTrk();
return *track_;
}
/// Return reference to a pseudo track made with candidate kinematics,
/// parameterized error for eta,phi,pt and full IP covariance
/// and the coviriance matrix is forced to be positive definite according to BPH recommandations
virtual const reco::Track pseudoPosDefTrack() const;

/// return a pointer to the track if present. otherwise, return a null pointer
const reco::Track *bestTrack() const override {
Expand Down
58 changes: 58 additions & 0 deletions DataFormats/PatCandidates/src/PackedCandidate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"

#include "DataFormats/Math/interface/liblogintpack.h"

#include "TMatrixDSym.h"
#include "TVectorD.h"
using namespace logintpack;

CovarianceParameterization pat::PackedCandidate::covarianceParameterization_;
Expand Down Expand Up @@ -105,6 +108,7 @@ void pat::PackedCandidate::unpackCovariance() const {
unpackCovarianceElement(*m, packedCovariance_.dxydz, 3, 4);
unpackCovarianceElement(*m, packedCovariance_.dlambdadz, 1, 4);
unpackCovarianceElement(*m, packedCovariance_.dphidxy, 2, 3);

reco::TrackBase::CovarianceMatrix *expected = nullptr;
if (m_.compare_exchange_strong(expected, m.get())) {
m.release();
Expand Down Expand Up @@ -161,6 +165,60 @@ float pat::PackedCandidate::dz(const Point &p) const {
((vertex_.load()->X() - p.X()) * std::cos(phi) + (vertex_.load()->Y() - p.Y()) * std::sin(phi)) * pzpt;
}

const reco::Track pat::PackedCandidate::pseudoPosDefTrack() const {
//if (posdeftrack_) return *posdeftrack_;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this line be removed?

// perform the regular unpacking of the track
if (!track_)
unpackTrk();

// std::cout<<"unpacking enforcing positive-definite cov matrix"<<std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove or add a LogDebug

//calculate the determinant and verify positivity
double det = 0;
bool notPosDef = (!(*m_).Sub<AlgebraicSymMatrix22>(0, 0).Det(det) || det < 0) ||
(!(*m_).Sub<AlgebraicSymMatrix33>(0, 0).Det(det) || det < 0) ||
(!(*m_).Sub<AlgebraicSymMatrix44>(0, 0).Det(det) || det < 0) || (!(*m_).Det(det) || det < 0);

if (notPosDef) {
// std::cout << "during unpacking, the determinant is: " << det << std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove or add a LogDebug

reco::TrackBase::CovarianceMatrix m(*m_);
//if not positive-definite, alter values to allow for pos-def
TMatrixDSym eigenCov(5);
for (int i = 0; i < 5; i++) {
for (int j = 0; j < 5; j++) {
if (std::isnan((m)(i, j)) || std::isinf((m)(i, j)))
eigenCov(i, j) = 1e-6;
else
eigenCov(i, j) = (m)(i, j);
}
}
TVectorD eigenValues(5);
eigenCov.EigenVectors(eigenValues);
double minEigenValue = eigenValues.Min();
double delta = 1e-6;
if (minEigenValue < 0) {
for (int i = 0; i < 5; i++)
m(i, i) += delta - minEigenValue;
}

// bool notPosDef = (!m.Sub<AlgebraicSymMatrix22>(0, 0).Det(det) || det < 0) ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line plus the 3 after

// (!m.Sub<AlgebraicSymMatrix33>(0, 0).Det(det) || det < 0) ||
// (!m.Sub<AlgebraicSymMatrix44>(0, 0).Det(det) || det < 0) || (!m.Det(det) || det < 0);
// std::cout << " the determinant of the corrected covariance matrix is: " << det << std::endl;
// make a track object with pos def covariance matrix
return reco::Track(normalizedChi2_ * (*track_).ndof(),
(*track_).ndof(),
*vertex_,
(*track_).momentum(),
(*track_).charge(),
m,
reco::TrackBase::undefAlgorithm,
reco::TrackBase::loose);
} else {
// just return a copy of the unpacked track
return reco::Track(*track_);
}
}

void pat::PackedCandidate::unpackTrk() const {
maybeUnpackBoth();
math::RhoEtaPhiVector p3(ptTrk(), etaAtVtx(), phiAtVtx());
Expand Down