Minor fixes to spatial PDR code (to load calib data).
Merge commit 'e20fbc5bd4389a673c28e72fee20c8bf13609dc3'