rewrite of geometric calibration