script/motion/mount.py

@@ -26,7 +26,7 @@ def mount(segment, puck, sample, force=False):
     location = get_current_point()
     print "Location: " + location
 
-    robot.move_dewar()        
+    robot.move_dewar_wait()        
     try:
         robot.get_dewar(segment, puck, sample)
     except:

script/motion/unmount.py

@@ -32,13 +32,13 @@ def unmount(segment, puck, sample, force=False):
         raise
 
     try:
-        robot.move_dewar()        
+        robot.move_dewar_wait()        
     except:
         #TODO: recover
         raise
 
     try:
-        robot.pet_dewar(segment, puck, sample)
+        robot.put_dewar(segment, puck, sample)
     except:
         #robot.move_dewar()        
         raise