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.

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

Jump to bottom

Save pixel and strip layers in miniAOD #15605

Merged
merged 6 commits into from
Aug 29, 2016
Merged

Save pixel and strip layers in miniAOD #15605

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2e9c66
Add strip and pixel layers to the miniAOD packed candidates
gpetruc Aug 25, 2016
71d6347
Monitoring of layers in PackedCandidateTrackValidator
gpetruc Aug 25, 2016
1a9b060
PackedCandidateTrackValidator: Include monitoring plots of numbers of…
gpetruc Aug 25, 2016
09284c6
PackedCandidate::bestTrack with the right number of layers
gpetruc Aug 25, 2016
4d00309
Fix check on bestTrack(). packedLayers_ is not going to be zero for n…
gpetruc Aug 25, 2016
45fe985
Add comments explainig the logic
gpetruc Aug 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
67 changes: 61 additions & 6 deletions DQM/TrackingMonitor/src/PackedCandidateTrackValidator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,15 +491,23 @@ class PackedCandidateTrackValidator: public DQMEDAnalyzer{
MonitorElement *h_diffEtaError;


MonitorElement *h_diffNumberOfPixelLayers;
MonitorElement *h_diffNumberOfStripLayers;
MonitorElement *h_diffNumberOfPixelHits;
MonitorElement *h_diffNumberOfHits;
MonitorElement *h_diffLostInnerHits;

MonitorElement *h_diffHitPatternPixelLayersWithMeasurement;
MonitorElement *h_diffHitPatternTrackerLayersWithMeasurement;
MonitorElement *h_diffHitPatternStripLayersWithMeasurement;
MonitorElement *h_diffHitPatternNumberOfValidPixelHits;
MonitorElement *h_diffHitPatternNumberOfValidHits;
MonitorElement *h_diffHitPatternNumberOfLostInnerHits;
MonitorElement *h_diffHitPatternHasValidHitInFirstPixelBarrel;

MonitorElement *h_numberPixelLayersOverMax;
MonitorElement *h_numberStripLayersOverMax;
MonitorElement *h_numberLayersOverMax;
MonitorElement *h_numberPixelHitsOverMax;
MonitorElement *h_numberStripHitsOverMax;
MonitorElement *h_numberHitsOverMax;
Expand Down Expand Up @@ -611,15 +619,23 @@ void PackedCandidateTrackValidator::bookHistograms(DQMStore::IBooker& iBooker, e
h_diffEtaError = iBooker.book1D("diffEtaError", "(PackedCandidate::bestTrack() - reco::Track)/reco::Track in etaError()", 60, -0.15, 0.15); // not equal


h_diffNumberOfPixelLayers = iBooker.book1D("diffNumberOfPixelLayers", "PackedCandidate::pixelLayersWithMeasurement() - reco::Track::hitPattern::pixelLayersWithMeasurement()", 5, -2.5, 2.5); // expect equality
h_diffNumberOfStripLayers = iBooker.book1D("diffNumberOfStripLayers", "PackedCandidate::stripLayersWithMeasurement() - reco::Track::hitPattern::stripLayersWithMeasurement()", 5, -2.5, 2.5); // expect equality
h_diffNumberOfPixelHits = iBooker.book1D("diffNumberOfPixelHits", "PackedCandidate::numberOfPixelHits() - reco::Track::hitPattern::numberOfValidPixelHits()", 5, -2.5, 2.5); // expect equality
h_diffNumberOfHits = iBooker.book1D("diffNumberOfHits", "PackedCandidate::numberHits() - reco::Track::hitPattern::numberOfValidHits()", 5, -2.5, 2.5); // expect equality
h_diffLostInnerHits = iBooker.book1D("diffLostInnerHits", "PackedCandidate::lostInnerHits() - reco::Track::hitPattern::numberOfLostHits(MISSING_INNER_HITS)", 5, -2.5, 2.5); // expect equality

h_diffHitPatternPixelLayersWithMeasurement = iBooker.book1D("diffHitPatternPixelLayersWithMeasurement", "PackedCandidate::bestTrack() - reco::Track in hitPattern::pixelLayersWithMeasurement()", 13, -10.5, 2.5); // not equal
h_diffHitPatternStripLayersWithMeasurement = iBooker.book1D("diffHitPatternStripLayersWithMeasurement", "PackedCandidate::bestTrack() - reco::Track in hitPattern::stripLayersWithMeasurement()", 13, -10.5, 2.5); // not equal
h_diffHitPatternTrackerLayersWithMeasurement = iBooker.book1D("diffHitPatternTrackerLayersWithMeasurement", "PackedCandidate::bestTrack() - reco::Track in hitPattern::trackerLayersWithMeasurement()", 13, -10.5, 2.5); // not equal
h_diffHitPatternNumberOfValidPixelHits = iBooker.book1D("diffHitPatternNumberOfValidPixelHits", "PackedCandidate::bestTrack() - reco::Track in hitPattern::numberOfValidPixelHits()", 13, -10.5, 2.5); // not equal
h_diffHitPatternNumberOfValidHits = iBooker.book1D("diffHitPatternNumberOfValidHits", "PackedCandidate::bestTrack() - reco::Track in hitPattern::numberOfValidHits()", 13, -10.5, 2.5); // not equal
h_diffHitPatternNumberOfLostInnerHits = iBooker.book1D("diffHitPatternNumberOfLostPixelHits", "PackedCandidate::bestTrack() - reco::Track in hitPattern::numberOfLostHits(MISSING_INNER_HITS)", 13, -10.5, 2.5); // not equal
h_diffHitPatternHasValidHitInFirstPixelBarrel = iBooker.book1D("diffHitPatternHasValidHitInFirstPixelBarrel", "PackedCandidate::bestTrack() - reco::Track in hitPattern::hasValidHitInFirstPixelBarrel", 3, -1.5, 1.5); // expect equality

h_numberPixelLayersOverMax = iBooker.book1D("numberPixelLayersOverMax", "Number of pixel layers over the maximum of PackedCandidate", 10, 0, 10);
h_numberStripLayersOverMax = iBooker.book1D("numberStripLayersOverMax", "Number of strip layers over the maximum of PackedCandidate", 10, 0, 10);
h_numberLayersOverMax = iBooker.book1D("numberLayersOverMax", "Number of layers over the maximum of PackedCandidate", 20, 0, 20);
h_numberPixelHitsOverMax = iBooker.book1D("numberPixelHitsOverMax", "Number of pixel hits over the maximum of PackedCandidate", 10, 0, 10);
h_numberStripHitsOverMax = iBooker.book1D("numberStripHitsOverMax", "Number of strip hits over the maximum of PackedCandidate", 10, 0, 10);
h_numberHitsOverMax = iBooker.book1D("numberHitsOverMax", "Number of hits over the maximum of PackedCandidate", 20, 0, 20);
Expand Down Expand Up @@ -759,24 +775,53 @@ void PackedCandidateTrackValidator::analyze(const edm::Event& iEvent, const edm:
const auto pcNumberOfHits = pcRef->numberOfHits();
const auto pcNumberOfPixelHits = pcRef->numberOfPixelHits();
const auto pcNumberOfStripHits = pcNumberOfHits - pcNumberOfPixelHits;

const int pixelOverflow = trackNumberOfPixelHits > pat::PackedCandidate::trackPixelHitsMask ? trackNumberOfPixelHits - pat::PackedCandidate::trackPixelHitsMask : 0;
const int stripOverflow = trackNumberOfStripHits > pat::PackedCandidate::trackStripHitsMask ? trackNumberOfStripHits - pat::PackedCandidate::trackStripHitsMask : 0;
const int hitsOverflow = trackNumberOfHits > (pat::PackedCandidate::trackPixelHitsMask+pat::PackedCandidate::trackStripHitsMask) ? trackNumberOfHits - (pat::PackedCandidate::trackPixelHitsMask+pat::PackedCandidate::trackStripHitsMask) : 0;
const auto trackNumberOfLayers = track.hitPattern().trackerLayersWithMeasurement();
const auto trackNumberOfPixelLayers = track.hitPattern().pixelLayersWithMeasurement();
const auto trackNumberOfStripLayers = track.hitPattern().stripLayersWithMeasurement();
const auto pcNumberOfLayers = pcRef->trackerLayersWithMeasurement();
const auto pcNumberOfPixelLayers = pcRef->pixelLayersWithMeasurement();
const auto pcNumberOfStripLayers = pcRef->stripLayersWithMeasurement();

// layer number overflow (should be zero)
const int pixelLayerOverflow = trackNumberOfPixelLayers > pat::PackedCandidate::trackPixelHitsMask ? trackNumberOfPixelLayers - pat::PackedCandidate::trackPixelHitsMask : 0;
const int stripLayerOverflow = trackNumberOfStripLayers > pat::PackedCandidate::trackStripHitsMask ? trackNumberOfStripLayers - pat::PackedCandidate::trackStripHitsMask : 0;
const int layerOverflow = trackNumberOfLayers > (pat::PackedCandidate::trackPixelHitsMask+pat::PackedCandidate::trackStripHitsMask) ? trackNumberOfLayers - (pat::PackedCandidate::trackPixelHitsMask+pat::PackedCandidate::trackStripHitsMask) : 0;

// hit overflow (should also be zero)
const int pixelOverflow = trackNumberOfPixelHits - pcNumberOfPixelLayers > pat::PackedCandidate::trackPixelHitsMask ? trackNumberOfPixelHits - pcNumberOfPixelLayers - pat::PackedCandidate::trackPixelHitsMask : 0;
const int stripOverflow = trackNumberOfStripHits - pcNumberOfStripLayers > pat::PackedCandidate::trackStripHitsMask ? trackNumberOfStripHits - pcNumberOfStripLayers - pat::PackedCandidate::trackStripHitsMask : 0;
const int hitsOverflow = trackNumberOfHits - pcNumberOfLayers > (pat::PackedCandidate::trackPixelHitsMask+pat::PackedCandidate::trackStripHitsMask) ? trackNumberOfHits - pcNumberOfLayers - (pat::PackedCandidate::trackPixelHitsMask+pat::PackedCandidate::trackStripHitsMask) : 0;
// PackedCandidate counts overflow pixel hits as strip
const int pixelInducedStripOverflow = (trackNumberOfStripHits+pixelOverflow) > pat::PackedCandidate::trackStripHitsMask ? (trackNumberOfStripHits+pixelOverflow-stripOverflow) - pat::PackedCandidate::trackStripHitsMask : 0;
const int pixelInducedStripOverflow = (trackNumberOfStripHits+pixelOverflow-pcNumberOfStripLayers) > pat::PackedCandidate::trackStripHitsMask ? (trackNumberOfStripHits+pixelOverflow-stripOverflow-pcNumberOfStripLayers) - pat::PackedCandidate::trackStripHitsMask : 0;
h_numberPixelLayersOverMax->Fill(pixelLayerOverflow);
h_numberStripLayersOverMax->Fill(stripLayerOverflow);
h_numberLayersOverMax->Fill(layerOverflow);
h_numberPixelHitsOverMax->Fill(pixelOverflow);
h_numberStripHitsOverMax->Fill(stripOverflow);
h_numberHitsOverMax->Fill(hitsOverflow);

int diffNumberOfPixelHits = 0;
int diffNumberOfHits = 0;
int diffNumberOfPixelLayers = 0;
int diffNumberOfStripLayers = 0;
if(pixelLayerOverflow) {
diffNumberOfPixelLayers = pcNumberOfPixelLayers - pat::PackedCandidate::trackPixelHitsMask;
}
else {
diffNumberOfPixelLayers = pcNumberOfPixelLayers - trackNumberOfPixelLayers;
}
if(pixelOverflow) {
diffNumberOfPixelHits = pcNumberOfPixelHits - pat::PackedCandidate::trackPixelHitsMask;
diffNumberOfPixelHits = pcNumberOfPixelHits - pcNumberOfPixelLayers - pat::PackedCandidate::trackPixelHitsMask;
}
else {
diffNumberOfPixelHits = pcNumberOfPixelHits - trackNumberOfPixelHits;
}
if(stripLayerOverflow) {
diffNumberOfStripLayers = pcNumberOfStripLayers - pat::PackedCandidate::trackStripHitsMask;
}
else {
diffNumberOfStripLayers = pcNumberOfStripLayers - trackNumberOfStripLayers;
}
if(stripOverflow || pixelInducedStripOverflow || pixelOverflow) {
int diffNumberOfStripHits = 0;
if(stripOverflow || pixelInducedStripOverflow) {
Expand All @@ -792,8 +837,12 @@ void PackedCandidateTrackValidator::analyze(const edm::Event& iEvent, const edm:
diffNumberOfHits = pcNumberOfHits - trackNumberOfHits;
}



fillNoFlow(h_diffNumberOfPixelHits, diffNumberOfPixelHits);
fillNoFlow(h_diffNumberOfHits, diffNumberOfHits);
fillNoFlow(h_diffNumberOfPixelLayers, diffNumberOfPixelLayers);
fillNoFlow(h_diffNumberOfStripLayers, diffNumberOfStripLayers);

int diffLostInnerHits = 0;
const auto trackLostInnerHits = track.hitPattern().numberOfLostHits(reco::HitPattern::MISSING_INNER_HITS);
Expand All @@ -812,6 +861,12 @@ void PackedCandidateTrackValidator::analyze(const edm::Event& iEvent, const edm:
fillNoFlow(h_diffLostInnerHits, diffLostInnerHits);

// For HitPattern ones, calculate the full diff (i.e. some differences are expected)
auto diffHitPatternPixelLayersWithMeasurement = trackPc.hitPattern().pixelLayersWithMeasurement() - trackNumberOfPixelLayers;
fillNoFlow(h_diffHitPatternPixelLayersWithMeasurement, diffHitPatternPixelLayersWithMeasurement);
auto diffHitPatternStripLayersWithMeasurement = trackPc.hitPattern().stripLayersWithMeasurement() - trackNumberOfStripLayers;
fillNoFlow(h_diffHitPatternStripLayersWithMeasurement, diffHitPatternStripLayersWithMeasurement);
auto diffHitPatternTrackerLayersWithMeasurement = trackPc.hitPattern().trackerLayersWithMeasurement() - trackNumberOfLayers;
fillNoFlow(h_diffHitPatternTrackerLayersWithMeasurement, diffHitPatternTrackerLayersWithMeasurement);
auto diffHitPatternNumberOfValidPixelHits = trackPc.hitPattern().numberOfValidPixelHits() - trackNumberOfPixelHits;
fillNoFlow(h_diffHitPatternNumberOfValidPixelHits, diffHitPatternNumberOfValidPixelHits);
auto diffHitPatternNumberOfValidHits = trackPc.hitPattern().numberOfValidHits() - trackNumberOfHits;
Expand Down
35 changes: 23 additions & 12 deletions DataFormats/PatCandidates/interface/PackedCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace pat {
qualityFlags_(0), pvRefKey_(reco::VertexRef::invalidKey()),
dxydxy_(0),
dzdz_(0),dxydz_(0),dlambdadz_(0), dphidxy_(0),dptdpt_(0),detadeta_(0),
dphidphi_(0), packedHits_(0), normalizedChi2_(0) { }
dphidphi_(0), packedHits_(0), packedLayers_(0), normalizedChi2_(0) { }

explicit PackedCandidate( const reco::Candidate & c,
const reco::VertexRefProd &pvRefProd,
Expand All @@ -62,7 +62,7 @@ namespace pat {
p4c_( new LorentzVector(*p4_)), vertex_( new Point(c.vertex())), dphi_(0),
track_(nullptr), pdgId_(c.pdgId()), qualityFlags_(0), pvRefProd_(pvRefProd),
pvRefKey_(pvRefKey),dxydxy_(0),dzdz_(0),dxydz_(0), dlambdadz_(0),
dphidxy_(0),dptdpt_(0), detadeta_(0),dphidphi_(0), packedHits_(0),
dphidxy_(0),dptdpt_(0), detadeta_(0),dphidphi_(0), packedHits_(0), packedLayers_(0),
normalizedChi2_(0) {
packBoth();
}
Expand All @@ -77,7 +77,7 @@ namespace pat {
track_(nullptr), pdgId_(pdgId),
qualityFlags_(0), pvRefProd_(pvRefProd), pvRefKey_(pvRefKey),
dxydxy_(0),dzdz_(0),dxydz_(0),dlambdadz_(0),dphidxy_(0),dptdpt_(0),
detadeta_(0),dphidphi_(0),packedHits_(0),normalizedChi2_(0) {
detadeta_(0),dphidphi_(0),packedHits_(0),packedLayers_(0),normalizedChi2_(0) {
packBoth();
}

Expand All @@ -93,7 +93,7 @@ namespace pat {
pvRefProd_(pvRefProd), pvRefKey_(pvRefKey),
dxydxy_(0),dzdz_(0),dxydz_(0),
dlambdadz_(0),dphidxy_(0),dptdpt_(0), detadeta_(0),dphidphi_(0),
packedHits_(0),normalizedChi2_(0) {
packedHits_(0),packedLayers_(0),normalizedChi2_(0) {
packBoth();
}

Expand All @@ -120,7 +120,7 @@ namespace pat {
pvRefProd_(iOther.pvRefProd_),pvRefKey_(iOther.pvRefKey_),
dxydxy_(iOther.dxydxy_),dzdz_(iOther.dzdz_),dxydz_(iOther.dxydz_), dlambdadz_(iOther.dlambdadz_),
dphidxy_(iOther.dphidxy_),dptdpt_(iOther.dptdpt_), detadeta_(iOther.detadeta_),
dphidphi_(iOther.dphidphi_), packedHits_(iOther.packedHits_), normalizedChi2_(iOther.normalizedChi2_) {
dphidphi_(iOther.dphidphi_), packedHits_(iOther.packedHits_), packedLayers_(iOther.packedLayers_), normalizedChi2_(iOther.normalizedChi2_) {
}

PackedCandidate( PackedCandidate&& iOther) :
Expand All @@ -145,7 +145,7 @@ namespace pat {
pvRefProd_(std::move(iOther.pvRefProd_)),pvRefKey_(iOther.pvRefKey_),
dxydxy_(iOther.dxydxy_),dzdz_(iOther.dzdz_),dxydz_(iOther.dxydz_), dlambdadz_(iOther.dlambdadz_),
dphidxy_(iOther.dphidxy_),dptdpt_(iOther.dptdpt_), detadeta_(iOther.detadeta_),
dphidphi_(iOther.dphidphi_), packedHits_(iOther.packedHits_), normalizedChi2_(iOther.normalizedChi2_) {
dphidphi_(iOther.dphidphi_), packedHits_(iOther.packedHits_), packedLayers_(iOther.packedLayers_), normalizedChi2_(iOther.normalizedChi2_) {
}


Expand Down Expand Up @@ -214,6 +214,7 @@ namespace pat {
detadeta_=iOther.detadeta_;
dphidphi_=iOther.dphidphi_;
packedHits_=iOther.packedHits_;
packedLayers_=iOther.packedLayers_;
normalizedChi2_=iOther.normalizedChi2_;
return *this;
}
Expand Down Expand Up @@ -260,6 +261,7 @@ namespace pat {
detadeta_=iOther.detadeta_;
dphidphi_=iOther.dphidphi_;
packedHits_=iOther.packedHits_;
packedLayers_=iOther.packedLayers_;
normalizedChi2_=iOther.normalizedChi2_;
return *this;
}
Expand Down Expand Up @@ -400,20 +402,29 @@ namespace pat {
dphidphi_ = covariance(2,2)*pt()*pt();

normalizedChi2_ = tk.normalizedChi2();
int numberOfPixelHits_ = tk.hitPattern().numberOfValidPixelHits();
int numberOfPixelLayers_ = tk.hitPattern().pixelLayersWithMeasurement();
if (numberOfPixelLayers_ > trackPixelHitsMask) numberOfPixelLayers_ = trackPixelHitsMask;
int numberOfStripLayers_ = tk.hitPattern().stripLayersWithMeasurement();
if (numberOfStripLayers_ > trackStripHitsMask) numberOfStripLayers_ = trackStripHitsMask;
packedLayers_ = (numberOfPixelLayers_&trackPixelHitsMask) | (numberOfStripLayers_ << trackStripHitsShift);
int numberOfPixelHits_ = tk.hitPattern().numberOfValidPixelHits() - numberOfPixelLayers_;
if (numberOfPixelHits_ > trackPixelHitsMask) numberOfPixelHits_ = trackPixelHitsMask;
int numberOfStripHits_ = tk.hitPattern().numberOfValidHits() - numberOfPixelHits_;
int numberOfStripHits_ = tk.hitPattern().numberOfValidHits() - numberOfPixelHits_ - numberOfPixelLayers_ - numberOfStripLayers_;
Copy link
Contributor

Choose a reason for hiding this comment

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

some comments about the incremental meaning of values may be useful

if (numberOfStripHits_ > trackStripHitsMask) numberOfStripHits_ = trackStripHitsMask;
packedHits_ = (numberOfPixelHits_&trackPixelHitsMask) | (numberOfStripHits_ << trackStripHitsShift);

packBoth();
}

virtual void setTrackProperties( const reco::Track & tk ) {
setTrackProperties(tk,tk.covariance());
}

int numberOfPixelHits() const { return packedHits_ & trackPixelHitsMask; }
int numberOfHits() const { return (packedHits_ >> trackStripHitsShift) + numberOfPixelHits(); }
int numberOfPixelHits() const { return (packedHits_ & trackPixelHitsMask) + pixelLayersWithMeasurement(); }
int numberOfHits() const { return (packedHits_ >> trackStripHitsShift) + stripLayersWithMeasurement() + numberOfPixelHits(); }
int pixelLayersWithMeasurement() const { return packedLayers_ & trackPixelHitsMask; }
int stripLayersWithMeasurement() const { return (packedLayers_ >> trackStripHitsShift); }
int trackerLayersWithMeasurement() const { return stripLayersWithMeasurement() + pixelLayersWithMeasurement(); }

/// vertex position
virtual const Point & vertex() const { maybeUnpackBoth(); return *vertex_; }//{ if (fromPV_) return Point(0,0,0); else return Point(0,0,100); }
Expand Down Expand Up @@ -467,7 +478,7 @@ namespace pat {

/// return a pointer to the track if present. otherwise, return a null pointer
virtual const reco::Track * bestTrack() const {
if (packedHits_!=0) {
if (packedHits_!=0 || packedLayers_ !=0) {
if (!track_) unpackTrk();
return track_.load();
}
Expand Down Expand Up @@ -619,7 +630,7 @@ namespace pat {

/// IP covariance
CMS_THREAD_GUARD(vertex_) mutable float dxydxy_, dzdz_, dxydz_,dlambdadz_,dphidxy_,dptdpt_,detadeta_,dphidphi_;
uint8_t packedHits_;
uint8_t packedHits_, packedLayers_;
/// track quality information
uint8_t normalizedChi2_;
// uint8_t numberOfPixelHits_;
Expand Down