improved rabi flop fitting routines