Return to a safe state if calibcant-calibrate.py crashes during calibration.

diff --git a/bin/calibcant-calibrate.py b/bin/calibcant-calibrate.py
index f12112fc473628ca5f55f47490dbf1e5a8f7eba2..3d20ab3dd0127ce1b145fcd227d137a3982927b9 100755 (executable)
--- a/bin/calibcant-calibrate.py
+++ b/bin/calibcant-calibrate.py
@@ -32,8 +32,13 @@ def main(args):
         calibrator = _Calibrator(config=config, afm=afm)
         calibrator.setup_config()
         deflection = afm.piezo.read_deflection()
-        afm.stepper_approach(target_deflection=deflection + 1e3)
-        k,k_s,data = calibrator.calibrate(filename=filename)
+        try:
+            afm.stepper_approach(target_deflection=deflection + 1e3)
+            k,k_s,data = calibrator.calibrate(filename=filename)
+        except:
+            afm.move_away_from_surface()
+            afm.piezo.zero()
+            raise
     finally:
         for device in devices:
             device.close()