script/motion/unmount.py

@@ -1,7 +1,14 @@
-def unmount(segment, puck, sample, force=False):
+def unmount(segment = None, puck = None, sample = None, force=False):
     """
     """
     print "unmount: ", segment, puck, sample, force
+
+    if (segment is None) or (puck is None) or (sample is None):
+        pos = get_setting("mounted_sample_position")
+        if pos is None:
+            raise Exception("Mounted sample position is not defined")
+        segment, puck , sample = pos[0:1], int(pos[1]), int(pos[2])
+        print "Mounted sample position: ", segment, puck , sample
     
     #Initial checks
     assert_valid_address(segment, puck, sample)
@@ -14,7 +21,7 @@ def unmount(segment, puck, sample, force=False):
     #robot.assert_in_known_point()
     hexiposi.assert_homed()
 
-    if smart_magnet.check_mounted(idle_time=0.25, timeout = 1.0) == False:
+    if smart_magnet.check_mounted(idle_time=0.5, timeout = 3.0) == False:
         raise Exception("No pin detected on gonio")
     
 
@@ -38,6 +45,7 @@ def unmount(segment, puck, sample, force=False):
         update_samples_info_sample_unmount(get_puck_name(segment, puck), sample)      
         robot.move_dewar()        
         robot.put_dewar(segment, puck, sample)
+        set_setting("mounted_sample_position", None)
     finally:
         smart_magnet.set_default_current()