This commit is contained in:
@@ -22,6 +22,15 @@ def mount(segment, puck, sample, force=False, read_dm=False):
|
||||
#Initial checks
|
||||
assert_valid_address(segment, puck, sample)
|
||||
assert_puck_detected(segment, puck)
|
||||
|
||||
if robot.simulated:
|
||||
time.sleep(3.0)
|
||||
mount_sample_detected = True
|
||||
mount_sample_id = "YYY0001"
|
||||
update_samples_info_sample_mount(get_puck_name(segment, puck), sample, mount_sample_detected, mount_sample_id)
|
||||
set_setting("mounted_sample_position", get_sample_name(segment, puck, sample))
|
||||
return [mount_sample_detected, mount_sample_id]
|
||||
|
||||
robot.assert_no_task()
|
||||
robot.reset_motion()
|
||||
robot.wait_ready()
|
||||
@@ -84,8 +93,7 @@ def mount(segment, puck, sample, force=False, read_dm=False):
|
||||
except:
|
||||
dry_mount_count = 0
|
||||
set_setting("dry_mount_counter", dry_mount_count+1)
|
||||
#TODO: Auto-dry procedure
|
||||
|
||||
|
||||
if is_aux:
|
||||
robot.move_home()
|
||||
else:
|
||||
@@ -98,6 +106,7 @@ def mount(segment, puck, sample, force=False, read_dm=False):
|
||||
raise Exception("No pin detected on gonio")
|
||||
|
||||
if is_force_dry():
|
||||
smart_magnet.set_default_current()
|
||||
print "Auto dry"
|
||||
log("Starting auto dry", False)
|
||||
dry()
|
||||
|
||||
Reference in New Issue
Block a user