Re #9578 Add TOF correction algorithms