Merge branch 'cherry-pick-49472b64-2' into '21.0-mc16d'

Merge branch '21.0-JVC-fix' into '21.0-mc16d'

See merge request atlas/athena!6893

Former-commit-id: e6b7d017f0a76d6d144d3500f2d243ac4af6fcaa

PhysicsAnalysis/JetTagging/JetTagTools/src/JetVertexCharge.cxx

@@ -710,6 +710,7 @@ bool JetVertexCharge::passTrackCuts( const xAOD::TrackParticle &track) const {
    double d0 = track.d0();
    double z0 = track.z0();
    double theta = track.theta();
+   if (track.numberDoF() == 0) return false;
    double chi2 = track.chiSquared() / track.numberDoF();
    double deltaZ0 = fabs( z0 - m_primVtx->z() + track.vz() );