added rest of calibration parameters and fixed bug in conversion routine