Commit Graph
479 Commits
Author SHA1 Message Date
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
martinappleby f3b798b770 GUI: limit pgroup typing to only valid pgroups 2025-11-06 15:58:30 +01:00
martinappleby 337b59af39 GUI: attempt to make filters in the tell sample panel dependent on the other active filters 2025-11-06 15:53:22 +01:00
martinappleby 90a8f3f9b8 GUI: unmount button buf hopefully fixed by removing sampleshortinfo from signal 2025-11-06 15:48:07 +01:00
martinappleby 056f166b93 GUI: attempt at fixing the sorting function in refernce tools 2025-11-06 15:46:17 +01:00
appleb_m bbaf12c9d5 DAQ: add some logic to automation parameters for raster. 2025-11-06 14:05:55 +01:00
appleb_m e72f37d7ab DAQ: Update dtz between raster and rotation. Wired transmission from params to scans. Added more verbose debug statements to automation. 2025-11-06 13:49:03 +01:00
appleb_m f071ad6a88 DAQ: Update dtz between raster and rotation. Wired transmission from params to scans. Added more verbose debug statements to automation. 2025-11-06 13:48:41 +01:00
appleb_m 9d19c2c961 DAQ: correctly format logger 2025-11-06 13:47:02 +01:00
appleb_m 45e96b4a33 GUI: removed irrelevant logging from scan settings panel 2025-11-06 10:01:10 +01:00
appleb_m 504c640bf9 Dose calculation should not be 0 when sample unmounted. Now uses transmission 2025-11-06 10:00:42 +01:00
appleb_m 64053bdeec DAQ; raster defaults for automation updated 2025-11-06 10:00:19 +01:00
appleb_m 827743d89f GUI:updated default raster settings 2025-11-06 09:43:48 +01:00
appleb_m 05ce9ccd98 DAQ: updated default rotation settngs 2025-11-06 09:40:21 +01:00
appleb_m 5085477cf4 DAQ: updated default camera exposure settings for 6D 2025-11-06 09:40:07 +01:00
appleb_m 5376809685 GUI: scan_settings now uses new default fucnitons from number ine edits 2025-11-05 15:18:53 +01:00
appleb_m 52e25fd3d6 GUI: added defaults to numberlineedits and fixed a typo 2025-11-05 15:18:30 +01:00
appleb_m 83496f6e22 GUI: changed which camera view is visible during mounting 2025-11-05 15:17:59 +01:00
appleb_m c727e93c76 GUI: fixed bug in face detection panel where you couldnt see the labels for the number ine edit boces 2025-11-05 15:17:27 +01:00