Change calibration parameters to ensure that amplitude is fit
Fix merge conflict
Merge branch 'devel' into devel2