A stratified approach to self-calibration with a modus constraint