Cleaned up calibration computations

Compute degrees per screen first for simplicty