Skip to content

Save track fiducial sigma for all tracks, not just vetoed tracks #296

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

Open
lnestor wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Save track fiducial sigma for all tracks, not just vetoed tracks #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c185e7d
Track fiducial sigma for all tracks, not just vetoed tracks
lnestor Mar 6, 2026
8685d4f
Remove unused EtaPhiList struct
lnestor Mar 10, 2026
c89f2a7
Delete fiducial maps in destructor
lnestor Mar 10, 2026
9ac424c
Return from isFiducialTrack before setting maxSigma
lnestor Mar 10, 2026
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
96 changes: 51 additions & 45 deletions Collections/interface/DisappearingTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,36 +35,39 @@ namespace osu {
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &);
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &);
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double);
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<TYPE(jets)> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const bool);

// the DisappTrks constructor
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
DisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<TYPE(jets)> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const bool,
#if DATA_FORMAT_FROM_MINIAOD && DATA_FORMAT_IS_2017
const edm::Handle<vector<CandidateTrack> > &,
Expand Down Expand Up @@ -478,35 +481,38 @@ namespace osu {
SecondaryDisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &);
SecondaryDisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &);
SecondaryDisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
SecondaryDisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double);
SecondaryDisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<TYPE(jets)> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const bool);
// the DisappTrks constructor
SecondaryDisappearingTrack(const TYPE(tracks) &,
SecondaryDisappearingTrack(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<TYPE(jets)> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const bool,
#if DATA_FORMAT_FROM_MINIAOD && DATA_FORMAT_IS_2017
const edm::Handle<vector<CandidateTrack> > &,
Expand Down
90 changes: 37 additions & 53 deletions Collections/interface/TrackBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <random>
#include <chrono>

#include "TH2D.h"

#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
#include "DataFormats/PatCandidates/interface/PackedCandidate.h"

Expand All @@ -17,28 +19,6 @@
#define M_PI_2 1.57079632679489661923
#endif

struct EtaPhi {
double eta;
double phi;
double sigma;

EtaPhi(const double a, const double b, const double sigma = -1.0) :
eta(a),
phi(b),
sigma(sigma)
{
}
};

struct EtaPhiList : public vector<EtaPhi> {
double minDeltaR;

EtaPhiList() :
minDeltaR(0.0)
{
}
};

#if IS_VALID(tracks)

namespace osu
Expand All @@ -52,22 +32,24 @@ namespace osu
TrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &);
TrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &);
TrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
TrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double);
TrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<TYPE(jets)> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const bool);

~TrackBase();
Expand Down Expand Up @@ -281,7 +263,7 @@ namespace osu
float deltaRToClosestPFMuon_;
float deltaRToClosestPFChHad_;

const bool isFiducialTrack(const EtaPhiList &, const double, double &) const;
const bool isFiducialTrack(const TH2D *sigmaMap, const double minDeltaR, const double thresholdForVeto, double &maxSigma) const;
const edm::Ref<vector<reco::GsfTrack> > &findMatchedGsfTrack(const edm::Handle<vector<reco::GsfTrack> > &, edm::Ref<vector<reco::GsfTrack> > &, double &) const;
const bool isBadGsfTrack(const reco::GsfTrack &) const;
int isCloseToBadEcalChannel(const double &);
Expand All @@ -307,22 +289,24 @@ namespace osu
SecondaryTrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &);
SecondaryTrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &);
SecondaryTrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
SecondaryTrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double);
SecondaryTrackBase(const TYPE(tracks) &,
const edm::Handle<vector<osu::Mcparticle> > &,
const edm::Handle<vector<pat::PackedCandidate> > &,
const edm::Handle<vector<TYPE(jets)> > &,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const EtaPhiList &,
const EtaPhiList &,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const edm::ParameterSet &,
const edm::Handle<vector<reco::GsfTrack> > &,
const TH2D *,
const TH2D *,
const double,
const map<DetId, vector<double> > * const,
const map<DetId, vector<int> > * const,
const bool);

~SecondaryTrackBase();
Expand Down
Loading