323 Commits
Author SHA1 Message Date
appleb_m 2bb9b3dd29 Update version to 0.2.68 2025-12-12 14:42:33 +01:00
appleb_m ee74cdc92a DAQ: added ingest scan to rotation and screening. And fucntionality in aaredb 2025-12-12 14:35:58 +01:00
appleb_m aa1f7b0a73 DAQ: added wait messages for robot to track strange behaviour 2025-12-11 13:33:23 +01:00
appleb_m 6960e05815 DAQ: move_park isntead of dry. Need a park and dry fucnction 2025-12-11 13:31:34 +01:00
appleb_m eb66fd2f7f DAQ: don't wait for dry when failure, wait after dry when failure.
Added error message to track this.
2025-12-11 12:34:52 +01:00
appleb_m 178b963140 Merge branch 'master' into TellSampleHandling 2025-12-11 12:18:41 +01:00
appleb_m 1c27820026 DAQ: bug in MotionHandler fixed (string should be mount_count) 2025-12-11 12:18:09 +01:00
appleb_m c9b0ee2038 DAQ: Go back to start omega 2025-12-11 10:34:33 +01:00
appleb_m 4347e5b846 DAQ: bug fixes in mount handling 2025-12-10 16:49:21 +01:00
appleb_m 116aa51fdd GUI/DAQ: changed how tell mounting errors are handled. need to be tested 2025-12-10 16:05:36 +01:00
appleb_m 521a488ec6 Merge branch 'master' into TellSampleHandling 2025-12-10 14:14:16 +01:00
appleb_m 79694798db DAQ/CONFIG: added failed mount count, plus logic to DAQ. 2025-12-10 13:32:14 +01:00
appleb_m ee2f9a4789 DAQ: class added for critical Tell Failure and a warning exception for TELL errors 2025-12-10 13:28:49 +01:00
appleb_m 4196a1e468 DAQ: added error handling for mount exceptions in server.py. 2025-12-10 13:27:49 +01:00
appleb_m 2180412179 DAQ: authenticate for super users added 2025-12-10 13:23:50 +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 49ad78bc58 Tell: added a wait for Tell to be ready before going to dry 2025-12-04 11:49:56 +01:00
appleb_m ebde133677 Remove superfluos bec import (was ceommented out) 2025-12-04 11:32:42 +01:00
appleb_m 3c6630bbaa DAQ: omega check bug fix. 2025-12-04 11:31:21 +01:00
appleb_m 4ca89b6ffe Server: correctly masks status in a cleaner manner 2025-12-04 11:30:36 +01:00
appleb_m 0da0ebf325 aaredb: fixedbug where calling non-existent model due to versioning issues 2025-12-04 11:29:22 +01:00
appleb_m 4d068a49f9 DAQ: exception if fails to read auto_params 2025-12-02 13:32:18 +01:00
appleb_m 6633aa5680 DAQ: ingest script for screening - WIP 2025-12-02 13:31:18 +01:00
appleb_m 12bb65e1bd DAQ: Move aerotech to mount psotion when going to manual mount 2025-11-28 17:09:03 +01:00
appleb_m 3629f2ebd8 jfjoch client: added function co call api to get diffraction image 2025-11-28 17:06:15 +01:00
appleb_m f96bdf53b6 DAQ: submit diffraction image to database 2025-11-28 17:05:03 +01:00
appleb_m 1a313d4da5 Aaredb - add function to uplaod diffraction image 2025-11-28 16:50:37 +01:00
appleb_m d584409b0d Update toml to 0.2.66 2025-11-27 13:02:58 +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 e8b03539dd DAQ/: bug fixes in new implementation
Build and Publish / build (push) Successful in 23s
2025-11-27 12:31:45 +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 6de9b5b89d DAQ: added new TELL exceptions 2025-11-26 15:38:58 +01:00
appleb_m 4647a56c02 DAQ: add back in reflector down at end of raster scan, should move to beginning of raster fucntion or in auto. 2025-11-26 15:38:39 +01:00
appleb_m bd84f2368f daq:added http error handling for automation 2025-11-25 18:01:07 +01:00
appleb_m ca022505f2 daq: calcualte start_pxl correctly 2025-11-25 17:59:53 +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 fb8307cce0 DAQ: set raster grid start position correctly, do not filter below low res spots of 10, and add corner_coord bool 2025-11-25 09:08:25 +01:00
appleb_m c730ec456d Daq: update version to 0.2.61
Build and Publish / build (push) Failing after 26s
2025-11-21 11:07:46 +01:00
appleb_m 241e94db19 DAQ: vERICAL RASTER NOW USES 25% BEAM AS SIZE FOR VERTICAL STEP 2025-11-20 09:29:31 +01:00
appleb_m b2dbb4c286 DAQ: MlBox.py added debug statements when errors occur and fixed bug in check_box_relation and box_relation 2025-11-20 09:26:01 +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