This commit is contained in:
gac-S_Changer
2018-10-17 11:44:20 +02:00
parent 3d86c27140
commit b75f7d0ac8
10 changed files with 152 additions and 67 deletions

View File

@@ -9,7 +9,7 @@ def unmount(segment = None, puck = None, sample = None, force=False):
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
is_aux = segment == AUX_SEGMENT
is_aux = (segment == AUX_SEGMENT)
#Initial checks
assert_valid_address(segment, puck, sample)
@@ -49,10 +49,8 @@ def unmount(segment = None, puck = None, sample = None, force=False):
robot.get_gonio()
if is_aux:
robot.move_dewar()
robot.move_aux()
robot.put_aux( sample)
robot.move_home()
else:
#TODO: Shuld check if smart magnet detection is off?
update_samples_info_sample_unmount(get_puck_name(segment, puck), sample)