This commit also fixes the application of the empiricalShift in the tracking algorithm. It is now applied the same way as the offsets, namely: TOA + -1 * empiricalShift