Linear Recalibration of more than linear original calibration

The way calibration and recalibration are "folded" in libSONIC/SonicConf only works for linear calibration.

Either find a way to properly fold, or split calib and recal into two stages.