new logic for accepting orthogonality measurements; new axisymmetric conformal factor