Update for beam and gold tracks in analysis