geometric calibration rewrite complete