diff --git a/config/settings.properties b/config/settings.properties index 6a98c97..ecfbaee 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,12 +1,11 @@ -#Mon Oct 25 11:42:45 CEST 2021 -dry_mount_counter=1 -mounted_sample_position=C53 +#Tue Nov 02 14:34:59 CET 2021 +dry_mount_counter=0 room_temperature_enabled=false pin_offset=-0.0 cryopos_in=5.0 puck_types=true imaging_enabled=false -dry_timestamp=1.635154879385E9 +dry_timestamp=1.635792415241E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/config/variables.properties b/config/variables.properties index 741d6e8..4e37de6 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Oct 05 14:34:33 CEST 2021 -FileSequentialNumber=299 +#Tue Oct 26 10:21:14 CEST 2021 +FileSequentialNumber=301 diff --git a/devices/A2.properties b/devices/A2.properties index d865944..790bea4 100644 --- a/devices/A2.properties +++ b/devices/A2.properties @@ -1,3 +1,3 @@ -#Thu Nov 12 09:42:29 CET 2020 +#Mon Nov 01 15:55:42 CET 2021 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/A4.properties b/devices/A4.properties index 7dad517..2c26c5c 100644 --- a/devices/A4.properties +++ b/devices/A4.properties @@ -1,3 +1,3 @@ -#Thu Jun 06 15:40:34 CEST 2019 +#Thu Oct 28 09:20:17 CEST 2021 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/F3.properties b/devices/F3.properties index 16463c5..befbdf7 100644 --- a/devices/F3.properties +++ b/devices/F3.properties @@ -1,3 +1,3 @@ -#Thu Jun 06 15:47:23 CEST 2019 +#Mon Nov 01 15:55:32 CET 2021 detection=Mechanical -disabled=false +disabled=true diff --git a/script/motion/dry.py b/script/motion/dry.py index 383fc61..188f4f7 100644 --- a/script/motion/dry.py +++ b/script/motion/dry.py @@ -1,5 +1,5 @@ DEFAULT_DRY_HEAT_TIME = 40.0 -DEFAULT_DRY_SPEED = 0.45 +DEFAULT_DRY_SPEED = 0.35 DEFAULT_DRY_WAIT_COLD = 30.0 def dry(heat_time=None, speed=None, wait_cold = None): diff --git a/script/motion/mount.py b/script/motion/mount.py index a684392..437a085 100644 --- a/script/motion/mount.py +++ b/script/motion/mount.py @@ -198,7 +198,7 @@ def mount(segment, puck, sample, force=False, read_dm=False, auto_unmount=False) evlog("mount() SMC Detection", str(mount_sample_detected)) update_samples_info_sample_mount(get_puck_name(segment, puck), sample, mount_sample_detected, mount_sample_id) if mount_sample_detected == False: - raise Exception("No pin detected on gonio") + raise Exception("SAMPLE MISSING: No pin detected on gonio") # Check gripper for frozen sample after trying to mount on gonio # if we detect a sample after closing gripper then we move the