Commit Graph
497 Commits
Author SHA1 Message Date
appleb_m a4ebe9fded DAQ: COM added debug statement, crystal_size logs crystal size and quality condition filter now uses max low res spots to create a threshold of 30% - currently hardcoded 2025-11-20 09:24:28 +01:00
appleb_m 41c50e64c5 DAQ: identify_crystal_raster - no longer uses indexed spots, always uses low res spots and now moves 0.5 so that it centres on a square not the corner 2025-11-20 09:23:11 +01:00
appleb_m c9509f50e9 GUI: file_path_panel takes directory from spreadhseet if there is one otherwise previous default logic applies 2025-11-20 09:22:22 +01:00
appleb_m 8a3e3f4c76 DAQ: remove superfluous print statements in hutch shutter 2025-11-20 09:21:53 +01:00
appleb_m 257a9a9127 DAQ: remove comment in tidyup 2025-11-20 09:21:32 +01:00
appleb_m a96d2d67d0 DAQ: error message if unknown box class found 2025-11-20 09:21:15 +01:00
appleb_m f26b3a9c9b DAQ: added ingest gridscan, reflector up for normal requested raster and axc failure message added 2025-11-20 09:20:57 +01:00
appleb_m 9f248d84a4 DAQ: if no sample detected bhy gripper go to dry 2025-11-20 09:20:09 +01:00
appleb_m 264d939ea3 DAQ: bug in spreadsheetparams where file_prefix wasnt propogated when no other spreadsheet params given 2025-11-20 09:19:47 +01:00
appleb_m ff8741b68e DAQ: Updated daq status to use config 2025-11-20 09:19:18 +01:00
appleb_m c0cde06b8e DAQ: Updated spreadsheet and automation params 2025-11-20 09:18:31 +01:00
appleb_m bdfaf31c93 DAQ: Changes to automation and debugging statements improved in alc 2025-11-20 09:17:11 +01:00
appleb_m 1acb69e5f2 DAQ: added new properties to redis including crystal size, b_factor and automation_parameters 2025-11-20 09:09:53 +01:00
appleb_m b40b30c13d DAQ: added new properties to redis including crystal size, b_factor and automation_parameters 2025-11-20 09:09:45 +01:00
appleb_m 22d21dcb6d DAQ: tempoarily bring up reflector for data collection 2025-11-18 17:50:27 +01:00
appleb_m e7b4d12f58 DAQ-find_xtal.py error messages 2025-11-18 17:38:29 +01:00
appleb_m 192e290a67 Update pyproject.toml for aaredaq to 0.2.6
Build and Publish / build (push) Failing after 26s
0.2.6
2025-11-18 16:52:46 +01:00
appleb_m fc9b430de6 Update pyproject.toml for aaredaq 2025-11-18 16:51:23 +01:00
appleb_m e5bcd95f13 DAQ: added experiemtn hutch shutter to status bar 2025-11-18 13:38:32 +01:00
appleb_m d94860be39 DAQ: added error message to log when daq status fails 2025-11-18 13:35:06 +01:00
appleb_m e587f87c91 DAQ: added experiment hutch shutter to daq status model in models.py 2025-11-18 13:33:43 +01:00
appleb_m 6f53847492 DAQ: added experiment hutch shutter to daq so it can be closed in an emergency 2025-11-18 13:33:11 +01:00
appleb_m a96d2fa1ab DAQ: jfjoch_viewer.py change name to path in print statement during load 2025-11-17 13:11:11 +01:00
appleb_m a8446f5909 GUI: reference tool unmount button bug fix (again). Right click unmount also works! 2025-11-17 13:09:22 +01:00
leonarski_f c0164645a9 DAQ: Save Fluorescence for rotation scan 2025-11-13 11:42:52 +01:00
leonarski_f b3502e722a GUI: Fluorescence further improvements 2025-11-13 11:31:29 +01:00
leonarski_f d321d219a3 GUI: Fluorescence improvements 2025-11-13 10:56:33 +01:00
leonarski_f 5ca8ad9f64 GUI: Fluorescence split between panel and plot 2025-11-13 10:40:12 +01:00
leonarski_f 4833b06829 DAQ - Fluorescence spectrum allows to set transmission + energy is set correctly 2025-11-13 10:19:04 +01:00
leonarski_f 2fffeef0cf DAQ/GUI - Fluorescence spectrum in a single call 2025-11-13 09:01:05 +01:00
appleb_m 2021cf8cf0 DAQ/GUI - debug statements to check mlbox prediciton streamadn revert to usign mx-aare-test until mx-ml issue resolved. 2025-11-12 08:46:14 +01:00
appleb_m 49068b4431 Loger - change default location for gui but not daq 2025-11-12 08:45:27 +01:00
appleb_m cc48f8683b GUI: problem with x-ml ip, currently one is hardcoded - needs fixing asap 2025-11-12 08:44:30 +01:00
appleb_m 7e280b597d GUI: fixed typo in many logging statements in daq_worker.py 2025-11-12 08:43:55 +01:00
appleb_m 0ed47e7d4a DAQ/GUI: feature added - fluorimeter panel and device 2025-11-11 11:43:31 +01:00
appleb_m 209b0a279b DAQ: attempted fix to save raw data in /raw/data and chjange start omega in automation 2025-11-11 11:42:43 +01:00
appleb_m e5db4a7419 DAQ: attempted fix to set spreadsheet_params to None so simple params will be used 2025-11-11 11:35:18 +01:00
appleb_m 3ba6009b7b DAQ: added a check to see if curp or target_pos is Nonem as they are set to None when abr crashes 2025-11-11 11:34:34 +01:00
appleb_m 3f0e6873ea GUI: Fixed bug where start_angle wouldn't update to current value 2025-11-11 11:33:59 +01:00
appleb_m 070a26c53d GUI: Attempted fix to prevent skip of first sample, skip was inconsistent so may need lots of runs to confirm it does not happen 2025-11-10 10:56:31 +01:00
appleb_m 74430d213f GUI: Spot count (low res) is now the first option in raster_data_collection.py 2025-11-10 10:55:25 +01:00
appleb_m 7fb870eac4 GUI: Fixed sorting for mount count in reference_tools_panel.py and also the unmoutn button is now correctly wired 2025-11-10 09:42:48 +01:00
appleb_m 22790b7b87 Merge branch 'master' into ReferenceToolSort 2025-11-10 09:11:21 +01:00
martinappleby fab7d95a22 DAQ: fix to handle automated raster parameters 2025-11-07 14:07:58 +01:00
martinappleby 9f0bc6e076 GUI: added error handling if GUI fails to open. Will need to test to see if it crashes if any other errors are raised! 2025-11-07 14:07:32 +01:00
martinappleby 02ad6269c6 GUI: fixed bug where reference_tools_panel.py would infinite loop due to refactoring of self._rows to self._samples 2025-11-07 14:02:17 +01:00
martinappleby f6228dad5a GUI: added more verbose error handling to JFJochDbusClient 2025-11-07 14:01:45 +01:00
martinappleby 39322cde80 GUI: block signal in numberlineedit when update-value or force_update-value is called 2025-11-07 14:00:57 +01:00
appleb_m 36f8fa9d58 GUI: bug fix, if sample is None default values are no longer enforced by the GUI, user can edit values again. 2025-11-07 11:16:33 +01:00
appleb_m f95f92264e DAQ: bug fix where res could be None but now is compared correctly. 2025-11-07 11:06:59 +01:00