Calib: Improvements for convergence factor handling, energy calibration

Please do not merge until Dominik has looked at it. There's also some improvements for the quadratic energy correction planned.