Commit Graph
262 Commits
Author SHA1 Message Date
appleb_m 3ce4865b40 Merge branch 'master' into CheckedLineEdit 2025-12-10 13:35:39 +01:00
appleb_m 22a64cd6a3 GUI: bug in creating manual sample where run number couldn't be -1. May need fixing later.! 2025-12-10 13:20:05 +01:00
appleb_m dab6124928 GUI: re-enabled MLpredicitonthread. 2025-12-10 13:11:52 +01:00
appleb_m 88c0ce3242 GUI: updated CheckedLineEdit to raster, rotation and scansetttings. and corrected functionaility. 2025-12-10 13:11:29 +01:00
GotthardG 864f7aa005 DAQ: Adding run_number into SampleShortInfo model
Build and Publish / build (push) Successful in 23s
2025-12-10 10:28:01 +01:00
appleb_m d186e2d787 GUI: Added CheckedLineEdit to raster, rotation and scan settings 2025-12-09 16:13:03 +01:00
appleb_m a613beec44 GUI: Added CheckLienEdit class 2025-12-09 16:09:59 +01:00
leonarski_f 5f71f7730d GUI: Default fluorescence file name contains sample name 2025-12-05 11:29:16 +01:00
leonarski_f 2f95d522f0 GUI: Save fluorescence scan as CSV 2025-12-05 11:17:33 +01:00
appleb_m dcef9673ae GUI: set smart_parameters output of flux and dose to None so that smart-paramters are not emitted continuously 2025-12-04 11:49:28 +01:00
appleb_m 954b288f7d GUI: reformatted total_time label on rotation, raster and smart 2025-12-04 11:48:49 +01:00
appleb_m 15527a3622 Smart_params: minimum time now 1.1ms before chanfgin transimsission 2025-12-04 11:34:38 +01:00
appleb_m 56f95a4451 GUI: raster data colelction settings updated dtz 200 mm and 0.02 exp_time 2025-12-04 11:33:50 +01:00
appleb_m eea628937f GUI: remove prediction thread connection 2025-12-04 11:33:10 +01:00
appleb_m 4cb6fc5745 Smart_rotation_panel - only update when changes are made - this will be moved to daq soon 2025-12-04 11:30:56 +01:00
appleb_m a0d7a805ec Viewer: calls file rather than from online stream 2025-11-28 17:07:18 +01:00
appleb_m d584409b0d Update toml to 0.2.66 2025-11-27 13:02:58 +01:00
appleb_m 675f5a7d18 GUI: logging in rastergridmanager for debugging 2025-11-27 13:02:04 +01:00
appleb_m b9d86bad90 toml update to 0.2.65 2025-11-27 12:55:27 +01:00
appleb_m 7f0d06637d DAQ: bug fixes in new implementation of raster ingest, plus send COM too GUI for JFJoch viewer
Build and Publish / build (push) Failing after 26s
2025-11-27 12:54:21 +01:00
appleb_m d30729f655 DAQ/AAREDB: update how raster messages are sent to the db - now include COM, max_iamge number, beam_size and beamLocation. 2025-11-27 12:20:09 +01:00
appleb_m 19e569dc81 GUI: increase total range high limit to 9999.0 2025-11-27 12:19:39 +01:00
appleb_m 29dba9dd31 GUI: added check before colelction on all run buttons 2025-11-25 18:02:52 +01:00
appleb_m 79c974d447 GUI: hide-reference toosl if not staff =- probably should hdie the panel 2025-11-25 18:02:02 +01:00
appleb_m fca29699a6 GUI: more explciit error messages 2025-11-25 18:01:38 +01:00
appleb_m 04cf0447ef auth: was using incorrect logger 2025-11-25 18:00:04 +01:00
appleb_m 191365dab4 GUI: added message boxes that check the hutch shutter and the beam current 2025-11-25 17:59:25 +01:00
leonarski_f e72f30db23 DAQ/GUI: pyproject to 0.2.63
Build and Publish / build (push) Successful in 25s
2025-11-25 16:20:01 +01:00
leonarski_f 49369927b3 DAQ/GUI: correctly setup logger in files. 2025-11-25 14:52:54 +01:00
leonarski_f 53e941f4e4 DAQ/GUI: update to version 0.2.62 - changed how raster scan works so always relative to top left corner of grid. This is then corrected in the appropriate places and has been updated in the visualiser 2025-11-25 14:46:39 +01:00
leonarski_f 6d191c87bf GUI: file path protection for run numbers based on data collection type 2025-11-25 09:12:42 +01:00
leonarski_f a45aae8372 GUI: camera_image.py change colour of beam marker based on shutter status 2025-11-25 09:06:58 +01:00
leonarski_f 73c8f1e3be GUI: remove deep copy of raster grid due to recursive copy error 2025-11-25 09:06:05 +01:00
leonarski_f 63a0c519e3 GUI: rotation_data_collection.py and rast_grid added total measurement time and file path protection 2025-11-25 09:05:20 +01:00
leonarski_f 9a733ddfb0 GUI: ring_current protection for automation 2025-11-25 09:02:21 +01:00
leonarski_f caab2573df GUI: add MIN_DTZ to panel and set minimum dtz in scan settings panel to 108 2025-11-25 09:01:21 +01:00
leonarski_f f40edbb918 GUI: set minimum dtz in scan settings panel to 108 2025-11-25 08:59:19 +01:00
appleb_m 8ce63334e9 GUI: fixed bug where default was spots but said was low res spots
Build and Publish / build (push) Failing after 23s
2025-11-20 09:56:28 +01:00
appleb_m 8a0a6ed092 GUI: update simple panel to correctly send paramerters during automation and to intiailise vA 2025-11-20 09:27:20 +01:00
appleb_m 19858b8fe5 GUI: fixed bug where directory was incorrectly called in get parameter mappings 2025-11-20 09:26:46 +01:00
appleb_m c0d4a61176 GUI: relink ML predicitions 2025-11-20 09:24:39 +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 22d21dcb6d DAQ: tempoarily bring up reflector for data collection 2025-11-18 17:50:27 +01:00
appleb_m e5bcd95f13 DAQ: added experiemtn hutch shutter to status bar 2025-11-18 13:38:32 +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 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 2fffeef0cf DAQ/GUI - Fluorescence spectrum in a single call 2025-11-13 09:01:05 +01:00