This commit is contained in:
gac-S_Changer
2018-11-07 12:47:48 +01:00
parent c743b8d5a3
commit 742fbc5824
5 changed files with 16 additions and 6 deletions

View File

@@ -15,7 +15,7 @@ def unmount(segment = None, puck = None, sample = None, force=False):
assert_valid_address(segment, puck, sample)
assert_puck_detected(segment, puck)
if robot.simulated:
if robot.simulated:
time.sleep(3.0)
update_samples_info_sample_unmount(get_puck_name(segment, puck), sample)
set_setting("mounted_sample_position", None)
@@ -31,9 +31,10 @@ def unmount(segment = None, puck = None, sample = None, force=False):
set_status("Umounting: " + str(segment) + str(puck) + str(sample))
try:
smart_magnet.enforce_sample_detection()
if smart_magnet.check_mounted(idle_time=0.5, timeout = 3.0) == False:
raise Exception("No pin detected on gonio")
if not force:
smart_magnet.enforce_sample_detection()
if smart_magnet.check_mounted(idle_time=0.5, timeout = 3.0) == False:
raise Exception("No pin detected on gonio")
#Enabling