diff --git a/config/settings.properties b/config/settings.properties index b263c4d..f1b8ba4 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,11 +1,12 @@ -#Tue Dec 13 02:42:36 CET 2022 -dry_mount_counter=12 +#Tue Dec 13 14:07:32 CET 2022 +dry_mount_counter=0 +mounted_sample_position=C32 room_temperature_enabled=false pin_offset=-0.0 cryopos_in=5.0 puck_types=true imaging_enabled=false -dry_timestamp=1.670892576058E9 +dry_timestamp=1.670936852103E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/script/motion/unmount.py b/script/motion/unmount.py index ff6c3ee..7f2f6ae 100644 --- a/script/motion/unmount.py +++ b/script/motion/unmount.py @@ -27,8 +27,14 @@ def unmount(segment = None, puck = None, sample = None, force=True, auto_unmount needs_chilling = not is_rt and was_warm needs_drying = is_rt and was_cold move_cold_at_end = str(next_segment) in COLD_SEGMENTS - - + + try: + assert_puck_detected(segment, puck) + except: + msg = "puck for sample %s no longer present/detected afget get_dewar()" % (pos,) + evlog(msg) + raise Exception(msg) + #Initial checks if not auto_unmount: print "%4.1f s asserting" % (tg() - t1,)