Skip to content
Snippets Groups Projects

adding beam spot weights to InDetPhysVal monitoring

Merged adding beam spot weights to InDetPhysVal monitoring
miochoa/athena:master-miochoa--adding-weights into master
All threads resolved!
Merged Ines Ochoa requested to merge miochoa/athena:master-miochoa--adding-weights into master
All threads resolved!
Viewing commit 7c1c0431
Prev Next
Show latest version
9 files
+ 58
− 58
Compare changes
  • Side-by-side
  • Inline
Files
9
InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
+ 35
− 35
@@ -134,35 +134,35 @@ InDetPerfPlot_TrkInJet::initializePlots() {
void
InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& jet) {
InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& jet, float weight) {
float dR = jet.p4().DeltaR(trk.p4());
uint8_t iInnerMostPixelHits(0), iNextToInnerMostPixelHits(0), iPixHits(0), iSctHits(0), iTrtHits(0);
uint8_t iPixHoles(0), iSCTHoles(0), iTrtHTHits(0);
if (trk.summaryValue(iInnerMostPixelHits, xAOD::numberOfInnermostPixelLayerHits)) {
fillHisto(m_nInnerMostPixelHits_vs_dR, dR, iInnerMostPixelHits);
fillHisto(m_nInnerMostPixelHits_vs_dR, dR, iInnerMostPixelHits,weight);
}
if (trk.summaryValue(iNextToInnerMostPixelHits, xAOD::numberOfNextToInnermostPixelLayerHits)) {
fillHisto(m_nNextToInnerMostPixelHits_vs_dR, dR, iNextToInnerMostPixelHits);
fillHisto(m_nNextToInnerMostPixelHits_vs_dR, dR, iNextToInnerMostPixelHits,weight);
}
if (trk.summaryValue(iPixHits, xAOD::numberOfPixelHits)) {
fillHisto(m_nPixelHits_vs_dR, dR, iPixHits);
fillHisto(m_nPixelHits_vs_dR, dR, iPixHits,weight);
}
if (trk.summaryValue(iSctHits, xAOD::numberOfSCTHits)) {
fillHisto(m_nSCTHits_vs_dR, dR, iSctHits);
fillHisto(m_nSCTHits_vs_dR, dR, iSctHits,weight);
}
if (trk.summaryValue(iTrtHits, xAOD::numberOfTRTHits)) {
fillHisto(m_nTRTHits_vs_dR, dR, iTrtHits);
fillHisto(m_nTRTHits_vs_dR, dR, iTrtHits,weight);
}
if (trk.summaryValue(iPixHoles, xAOD::numberOfPixelHoles)) {
fillHisto(m_nPixelHoles_vs_dR, dR, iPixHoles);
fillHisto(m_nPixelHoles_vs_dR, dR, iPixHoles,weight);
}
if (trk.summaryValue(iSCTHoles, xAOD::numberOfSCTHoles)) {
fillHisto(m_nSCTHoles_vs_dR, dR, iSCTHoles);
fillHisto(m_nSCTHoles_vs_dR, dR, iSCTHoles,weight);
}
if (trk.summaryValue(iTrtHTHits, xAOD::numberOfTRTHighThresholdHits)) {
fillHisto(m_nTRTHighThresholdHits_vs_dR, dR, iTrtHTHits);
fillHisto(m_nTRTHighThresholdHits_vs_dR, dR, iTrtHTHits,weight);
}
// expert plots
if (m_iDetailLevel >= 100) {
@@ -174,58 +174,58 @@ InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& je
uint8_t iPixelDeadSensors(0), iSCTDeadSensors(0);
if (trk.summaryValue(iInnerMostPixelOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
fillHisto(m_nInnerMostPixelOutliers_vs_dR, dR, iInnerMostPixelOutliers);
fillHisto(m_nInnerMostPixelOutliers_vs_dR, dR, iInnerMostPixelOutliers,weight);
}
if (trk.summaryValue(iInnerMostPixelShared, xAOD::numberOfInnermostPixelLayerSharedHits)) {
fillHisto(m_nInnerMostPixelSharedHits_vs_dR, dR, iInnerMostPixelShared);
fillHisto(m_nInnerMostPixelSharedHits_vs_dR, dR, iInnerMostPixelShared,weight);
}
if (trk.summaryValue(iInnerMostPixelSplit, xAOD::numberOfInnermostPixelLayerSplitHits)) {
fillHisto(m_nInnerMostPixelSplitHits_vs_dR, dR, iInnerMostPixelSplit);
fillHisto(m_nInnerMostPixelSplitHits_vs_dR, dR, iInnerMostPixelSplit,weight);
}
if (trk.summaryValue(iExpectedInnerMostPixelHits, xAOD::expectInnermostPixelLayerHit)) {
fillHisto(m_nExpectedInnerMostPixelHits_vs_dR, dR, iExpectedInnerMostPixelHits);
fillHisto(m_nExpectedInnerMostPixelHits_vs_dR, dR, iExpectedInnerMostPixelHits,weight);
}
if (trk.summaryValue(iExpectedNextToInnerMostPixelHits, xAOD::expectNextToInnermostPixelLayerHit)) {
fillHisto(m_nExpectedNextToInnerMostPixelHits_vs_dR, dR, iExpectedNextToInnerMostPixelHits);
fillHisto(m_nExpectedNextToInnerMostPixelHits_vs_dR, dR, iExpectedNextToInnerMostPixelHits,weight);
}
if (trk.summaryValue(iPixelOutliers, xAOD::numberOfPixelOutliers)) {
fillHisto(m_nPixelOutliers_vs_dR, dR, iPixelOutliers);
fillHisto(m_nPixelOutliers_vs_dR, dR, iPixelOutliers, weight);
}
if (trk.summaryValue(iPixelContribLayers, xAOD::numberOfContribPixelLayers)) {
fillHisto(m_nPixelContribLayers_vs_dR, dR, iPixelContribLayers);
fillHisto(m_nPixelContribLayers_vs_dR, dR, iPixelContribLayers,weight);
}
if (trk.summaryValue(iPixelShared, xAOD::numberOfPixelSharedHits)) {
fillHisto(m_nPixelSharedHits_vs_dR, dR, iPixelShared);
fillHisto(m_nPixelSharedHits_vs_dR, dR, iPixelShared,weight);
}
if (trk.summaryValue(iPixelSplit, xAOD::numberOfPixelSplitHits)) {
fillHisto(m_nPixelSplitHits_vs_dR, dR, iPixelSplit);
fillHisto(m_nPixelSplitHits_vs_dR, dR, iPixelSplit,weight);
}
if (trk.summaryValue(iPixelGanged, xAOD::numberOfGangedPixels)) {
fillHisto(m_nPixelGangedHits_vs_dR, dR, iPixelGanged);
fillHisto(m_nPixelGangedHits_vs_dR, dR, iPixelGanged, weight);
}
if (trk.summaryValue(iPixelGangedFakes, xAOD::numberOfGangedFlaggedFakes)) {
fillHisto(m_nPixelGangedHitsFlaggedFakes_vs_dR, dR, iPixelGangedFakes);
}
if (trk.summaryValue(iSCTOutliers, xAOD::numberOfSCTOutliers)) {
fillHisto(m_nSCTOutliers_vs_dR, dR, iSCTOutliers);
fillHisto(m_nSCTOutliers_vs_dR, dR, iSCTOutliers,weight);
}
if (trk.summaryValue(iSCTDoubleHoles, xAOD::numberOfSCTDoubleHoles)) {
fillHisto(m_nSCTDoubleHoles_vs_dR, dR, iSCTDoubleHoles);
fillHisto(m_nSCTDoubleHoles_vs_dR, dR, iSCTDoubleHoles,weight);
}
if (trk.summaryValue(iSCTShared, xAOD::numberOfSCTSharedHits)) {
fillHisto(m_nSCTSharedHits_vs_dR, dR, iSCTShared);
fillHisto(m_nSCTSharedHits_vs_dR, dR, iSCTShared,weight);
}
if (trk.summaryValue(iTRTOutliers, xAOD::numberOfTRTOutliers)) {
fillHisto(m_nTRTOutliers_vs_dR, dR, iTRTOutliers);
fillHisto(m_nTRTOutliers_vs_dR, dR, iTRTOutliers,weight);
}
if (trk.summaryValue(iTRTHTOutliers, xAOD::numberOfTRTHighThresholdOutliers)) {
fillHisto(m_nTRTHighThresholdOutliers_vs_dR, dR, iTRTHTOutliers);
fillHisto(m_nTRTHighThresholdOutliers_vs_dR, dR, iTRTHTOutliers,weight);
}
if (trk.summaryValue(iPixelDeadSensors, xAOD::numberOfPixelDeadSensors)) {
fillHisto(m_nPixelDeadSensors_vs_dR, dR, iPixelDeadSensors);
fillHisto(m_nPixelDeadSensors_vs_dR, dR, iPixelDeadSensors,weight);
}
if (trk.summaryValue(iSCTDeadSensors, xAOD::numberOfSCTDeadSensors)) {
fillHisto(m_nSCTDeadSensors_vs_dR, dR, iSCTDeadSensors);
fillHisto(m_nSCTDeadSensors_vs_dR, dR, iSCTDeadSensors,weight);
}
}
@@ -240,15 +240,15 @@ InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& je
float chi2Overndof = ndof > 0 ? chi2 / ndof : 0;
fillHisto(m_reco_d0_vs_dR, dR, trk.d0());
fillHisto(m_reco_z0_vs_dR, dR, trk.z0());
fillHisto(m_reco_z0sin_vs_dR, dR, trk.z0()* trk.theta());
fillHisto(m_reco_phi_vs_dR, dR, phi);
fillHisto(m_reco_theta_vs_dR, dR, trk.theta());
fillHisto(m_reco_eta_vs_dR, dR, eta);
fillHisto(m_reco_pt_vs_dR, dR, pt);
fillHisto(m_reco_lowpt_vs_dR, dR, pt);
fillHisto(m_reco_chi2Overndof_vs_dR, dR, chi2Overndof);
fillHisto(m_reco_d0_vs_dR, dR, trk.d0(),weight);
fillHisto(m_reco_z0_vs_dR, dR, trk.z0(),weight);
fillHisto(m_reco_z0sin_vs_dR, dR, trk.z0()* trk.theta(),weight);
fillHisto(m_reco_phi_vs_dR, dR, phi,weight);
fillHisto(m_reco_theta_vs_dR, dR, trk.theta(),weight);
fillHisto(m_reco_eta_vs_dR, dR, eta,weight);
fillHisto(m_reco_pt_vs_dR, dR, pt,weight);
fillHisto(m_reco_lowpt_vs_dR, dR, pt,weight);
fillHisto(m_reco_chi2Overndof_vs_dR, dR, chi2Overndof,weight);
}