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 de659c69
Prev Next
Show latest version
3 files
+ 51
− 42
Compare changes
  • Side-by-side
  • Inline
Files
3
InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_VertexTruthMatching.cxx
+ 39
− 39
@@ -322,8 +322,8 @@ void InDetPerfPlot_VertexTruthMatching::fill(const xAOD::Vertex& vertex, const x
float diff_z=vertex.z()-tvrt->z();
const AmgSymMatrix(3)& covariance = vertex.covariancePosition();
float err_z = fabs(Amg::error(covariance, 2)) > 1e-7 ? Amg::error(covariance, 2) : 1000.;
fillHisto(m_vx_z_diff,diff_z);
fillHisto(m_vx_z_diff_pull,diff_z/err_z);
fillHisto(m_vx_z_diff,diff_z, weight);
fillHisto(m_vx_z_diff_pull,diff_z/err_z, weight);
}
// Get the match type info for each vertex:
@@ -333,7 +333,7 @@ void InDetPerfPlot_VertexTruthMatching::fill(const xAOD::Vertex& vertex, const x
try {
matchType = recoVtxMatchTypeInfo(vertex);
ATH_MSG_DEBUG("VERTEX DECORATOR ======= " << matchType << ", with nTRACKS === " << vertex.nTrackParticles() << ", vertex index = " << vertex.index() << " AT (x, y, z) = (" << vertex.x() << ", " << vertex.y() << ", " << vertex.z() << ")");
fillHisto(m_vx_type_truth, matchType);
fillHisto(m_vx_type_truth, matchType, weight);
}
catch (SG::ExcBadAuxVar &) {
ATH_MSG_WARNING("VertexMatchType DECORATOR seems to be available, but may be broken ===========");
@@ -443,29 +443,29 @@ void InDetPerfPlot_VertexTruthMatching::fill(const xAOD::VertexContainer& vertex
float vtxerr_z = fabs(Amg::error(covariance, 2)) > 1e-7 ? Amg::error(covariance, 2) : 1000.;
localPUDensity = getLocalPUDensity(matchVertex, truthHSVertices, truthPUVertices);
fillHisto(m_vx_all_z_pull, residual_z/vtxerr_z);
fillHisto(m_vx_all_y_pull, residual_y/vtxerr_y);
fillHisto(m_vx_all_x_pull, residual_x/vtxerr_x);
fillHisto(m_vx_all_z_pull, residual_z/vtxerr_z, beamSpotWeight);
fillHisto(m_vx_all_y_pull, residual_y/vtxerr_y, beamSpotWeight);
fillHisto(m_vx_all_x_pull, residual_x/vtxerr_x, beamSpotWeight);
fillHisto(m_vx_all_truth_z_res_vs_PU, localPUDensity, residual_z);
fillHisto(m_vx_all_truth_x_res_vs_PU, localPUDensity, residual_x);
fillHisto(m_vx_all_truth_y_res_vs_PU, localPUDensity, residual_y);
fillHisto(m_vx_all_truth_z_res_vs_PU, localPUDensity, residual_z, beamSpotWeight);
fillHisto(m_vx_all_truth_x_res_vs_PU, localPUDensity, residual_x, beamSpotWeight);
fillHisto(m_vx_all_truth_y_res_vs_PU, localPUDensity, residual_y, beamSpotWeight);
fillHisto(m_vx_all_z_res, residual_z);
fillHisto(m_vx_all_y_res, residual_y);
fillHisto(m_vx_all_x_res, residual_x);
fillHisto(m_vx_all_z_res, residual_z, beamSpotWeight);
fillHisto(m_vx_all_y_res, residual_y, beamSpotWeight);
fillHisto(m_vx_all_x_res, residual_x, beamSpotWeight);
fillHisto(m_vx_all_truth_z_pull_vs_PU, localPUDensity, residual_z/vtxerr_z);
fillHisto(m_vx_all_truth_x_pull_vs_PU, localPUDensity, residual_x/vtxerr_y);
fillHisto(m_vx_all_truth_y_pull_vs_PU, localPUDensity, residual_y/vtxerr_x);
fillHisto(m_vx_all_truth_z_pull_vs_PU, localPUDensity, residual_z/vtxerr_z, beamSpotWeight);
fillHisto(m_vx_all_truth_x_pull_vs_PU, localPUDensity, residual_x/vtxerr_y, beamSpotWeight);
fillHisto(m_vx_all_truth_y_pull_vs_PU, localPUDensity, residual_y/vtxerr_x, beamSpotWeight);
fillHisto(m_vx_all_truth_z_res_vs_nTrk, vertex->nTrackParticles(), residual_z);
fillHisto(m_vx_all_truth_x_res_vs_nTrk, vertex->nTrackParticles(), residual_x);
fillHisto(m_vx_all_truth_y_res_vs_nTrk, vertex->nTrackParticles(), residual_y);
fillHisto(m_vx_all_truth_z_res_vs_nTrk, vertex->nTrackParticles(), residual_z, beamSpotWeight);
fillHisto(m_vx_all_truth_x_res_vs_nTrk, vertex->nTrackParticles(), residual_x, beamSpotWeight);
fillHisto(m_vx_all_truth_y_res_vs_nTrk, vertex->nTrackParticles(), residual_y, beamSpotWeight);
fillHisto(m_vx_all_truth_z_pull_vs_nTrk, vertex->nTrackParticles(), residual_z/vtxerr_z);
fillHisto(m_vx_all_truth_x_pull_vs_nTrk, vertex->nTrackParticles(), residual_x/vtxerr_y);
fillHisto(m_vx_all_truth_y_pull_vs_nTrk, vertex->nTrackParticles(), residual_y/vtxerr_x);
fillHisto(m_vx_all_truth_z_pull_vs_nTrk, vertex->nTrackParticles(), residual_z/vtxerr_z, beamSpotWeight);
fillHisto(m_vx_all_truth_x_pull_vs_nTrk, vertex->nTrackParticles(), residual_x/vtxerr_y, beamSpotWeight);
fillHisto(m_vx_all_truth_y_pull_vs_nTrk, vertex->nTrackParticles(), residual_y/vtxerr_x, beamSpotWeight);
} // end loop over vertices
@@ -489,29 +489,29 @@ void InDetPerfPlot_VertexTruthMatching::fill(const xAOD::VertexContainer& vertex
float vtxerr_y = Amg::error(covariance, 1);
float vtxerr_z = Amg::error(covariance, 2);
if(fabs(vtxerr_z) > 1e-7) fillHisto(m_vx_hs_z_pull, residual_z/vtxerr_z);
if(fabs(vtxerr_y) > 1e-7) fillHisto(m_vx_hs_y_pull, residual_y/vtxerr_y);
if(fabs(vtxerr_x) > 1e-7) fillHisto(m_vx_hs_x_pull, residual_x/vtxerr_x);
if(fabs(vtxerr_z) > 1e-7) fillHisto(m_vx_hs_z_pull, residual_z/vtxerr_z, beamSpotWeight);
if(fabs(vtxerr_y) > 1e-7) fillHisto(m_vx_hs_y_pull, residual_y/vtxerr_y, beamSpotWeight);
if(fabs(vtxerr_x) > 1e-7) fillHisto(m_vx_hs_x_pull, residual_x/vtxerr_x, beamSpotWeight);
fillHisto(m_vx_hs_truth_z_res_vs_PU, localPUDensity, residual_z);
fillHisto(m_vx_hs_truth_x_res_vs_PU, localPUDensity, residual_x);
fillHisto(m_vx_hs_truth_y_res_vs_PU, localPUDensity, residual_y);
fillHisto(m_vx_hs_truth_z_res_vs_PU, localPUDensity, residual_z, beamSpotWeight);
fillHisto(m_vx_hs_truth_x_res_vs_PU, localPUDensity, residual_x, beamSpotWeight);
fillHisto(m_vx_hs_truth_y_res_vs_PU, localPUDensity, residual_y, beamSpotWeight);
fillHisto(m_vx_hs_z_res, residual_z);
fillHisto(m_vx_hs_y_res, residual_y);
fillHisto(m_vx_hs_x_res, residual_x);
fillHisto(m_vx_hs_z_res, residual_z, beamSpotWeight);
fillHisto(m_vx_hs_y_res, residual_y, beamSpotWeight);
fillHisto(m_vx_hs_x_res, residual_x, beamSpotWeight);
fillHisto(m_vx_hs_truth_z_pull_vs_PU, localPUDensity, residual_z/vtxerr_z);
fillHisto(m_vx_hs_truth_x_pull_vs_PU, localPUDensity, residual_x/vtxerr_y);
fillHisto(m_vx_hs_truth_y_pull_vs_PU, localPUDensity, residual_y/vtxerr_x);
fillHisto(m_vx_hs_truth_z_pull_vs_PU, localPUDensity, residual_z/vtxerr_z, beamSpotWeight);
fillHisto(m_vx_hs_truth_x_pull_vs_PU, localPUDensity, residual_x/vtxerr_y, beamSpotWeight);
fillHisto(m_vx_hs_truth_y_pull_vs_PU, localPUDensity, residual_y/vtxerr_x, beamSpotWeight);
fillHisto(m_vx_hs_truth_z_res_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_z);
fillHisto(m_vx_hs_truth_x_res_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_x);
fillHisto(m_vx_hs_truth_y_res_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_y);
fillHisto(m_vx_hs_truth_z_res_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_z, beamSpotWeight);
fillHisto(m_vx_hs_truth_x_res_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_x, beamSpotWeight);
fillHisto(m_vx_hs_truth_y_res_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_y, beamSpotWeight);
fillHisto(m_vx_hs_truth_z_pull_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_z/vtxerr_z);
fillHisto(m_vx_hs_truth_x_pull_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_x/vtxerr_y);
fillHisto(m_vx_hs_truth_y_pull_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_y/vtxerr_x);
fillHisto(m_vx_hs_truth_z_pull_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_z/vtxerr_z, beamSpotWeight);
fillHisto(m_vx_hs_truth_x_pull_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_x/vtxerr_y, beamSpotWeight);
fillHisto(m_vx_hs_truth_y_pull_vs_nTrk, bestRecoHSVtx_truth->nTrackParticles(), residual_y/vtxerr_x, beamSpotWeight);
}
else {