Corrected calc_phi_s for debunching