Added a few changes to the calib code for spatial PDR.