Changed how tracks with hits from several mcParticles are handled