Update of TOF reconstruction and calibration classes to allow consistent usage of latest calibration scheme