From 2463ff3021b27f5e88cb672eb4f583c1f2cbec9a Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 3 Nov 2020 10:14:48 +0100 Subject: [PATCH] Display dewar on puck loading panel --- config/settings.properties | 9 +++++---- config/variables.properties | 4 ++-- devices/A1.properties | 4 ++-- devices/A2.properties | 4 ++-- devices/C2.properties | 4 ++-- devices/D4.properties | 2 +- devices/D5.properties | 2 +- script/data/samples.py | 13 +++++++++++++ 8 files changed, 28 insertions(+), 14 deletions(-) diff --git a/config/settings.properties b/config/settings.properties index 05c72e2..b024fbd 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,12 +1,13 @@ -#Tue Oct 06 13:51:13 CEST 2020 +#Tue Nov 03 10:11:02 CET 2020 dry_mount_counter=0 +mounted_sample_position=A57 room_temperature_enabled=false -pin_offset=0.516 +pin_offset=-0.0 puck_types=true imaging_enabled=false -dry_timestamp=1.60198507336E9 +dry_timestamp=1.60439410457E9 roi_h=1000 -led_level=0.0 +led_level=100.0 beamline_status_enabled=false force_dry_mount_count=15 roi_y=123 diff --git a/config/variables.properties b/config/variables.properties index e6764ee..c5d7547 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Sep 29 11:46:07 CEST 2020 -FileSequentialNumber=253 +#Tue Oct 27 11:53:58 CET 2020 +FileSequentialNumber=258 diff --git a/devices/A1.properties b/devices/A1.properties index 6d930a5..067b696 100644 --- a/devices/A1.properties +++ b/devices/A1.properties @@ -1,3 +1,3 @@ -#Tue Aug 18 13:55:19 CEST 2020 +#Sat Oct 24 09:16:45 CEST 2020 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/A2.properties b/devices/A2.properties index 52272ca..ca1d3c7 100644 --- a/devices/A2.properties +++ b/devices/A2.properties @@ -1,3 +1,3 @@ -#Tue Mar 10 08:15:40 CET 2020 +#Sat Oct 24 09:16:48 CEST 2020 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/C2.properties b/devices/C2.properties index 7e4830e..2a5d92b 100644 --- a/devices/C2.properties +++ b/devices/C2.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:34 CEST 2019 +#Sat Oct 24 09:40:19 CEST 2020 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/D4.properties b/devices/D4.properties index a7cb603..18e4fc5 100644 --- a/devices/D4.properties +++ b/devices/D4.properties @@ -1,3 +1,3 @@ -#Fri Sep 04 11:50:28 CEST 2020 +#Wed Oct 14 16:15:14 CEST 2020 detection=Mechanical disabled=false diff --git a/devices/D5.properties b/devices/D5.properties index 0fa5fe0..b4fdd66 100644 --- a/devices/D5.properties +++ b/devices/D5.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:57 CEST 2019 +#Wed Oct 14 16:30:04 CEST 2020 detection=Mechanical disabled=false diff --git a/script/data/samples.py b/script/data/samples.py index 13be0d0..aab0672 100644 --- a/script/data/samples.py +++ b/script/data/samples.py @@ -134,6 +134,19 @@ def get_puck_datamatrix(): ret[si["puckBarcode"]] = si["puckAddress"] return ret +def get_puck_datamatrix_info(): + ret = {} + for si in samples_info: + if si["puckBarcode"] is not None and si["puckBarcode"]!="": + info = {} + info["address"] = si["puckAddress"] + info["dewar"] = si ["dewarName"] + info["name"] = si ["puckName"] + info["user"] = si ["userName"] + info["type"] = si ["puckType"] + ret[si["puckBarcode"]] = info + return ret + def get_puck_address(barcode): try: return get_puck_datamatrix()[barcode]