Commit Graph
342 Commits
Author SHA1 Message Date
leonarski_f 18014e2d7c DAQ/GUI: Add relative omega movement - to be tested 2026-01-15 12:57:36 +01:00
appleb_m 8bad7a8308 update to conf.py to resovle import errors
Build and Publish / build (push) Successful in 22s
Build and Publish / Build and Deploy Docs (push) Successful in 40s
2026-01-05 16:42:25 +01:00
appleb_m 556c1f734c update to conf.py to resovle import errors
Build and Publish / build (push) Successful in 23s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-01-05 16:21:27 +01:00
appleb_m e7e8c2c8a1 update to conf.py to resovle import errors
Build and Publish / build (push) Successful in 23s
Build and Publish / Build and Deploy Docs (push) Successful in 39s
2026-01-05 16:15:08 +01:00
appleb_m 46074a635d update to conf.py for autodeployment of docs
Build and Publish / build (push) Successful in 23s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-01-05 16:10:00 +01:00
appleb_m 247d50141b added # to markdown files, changed index filepath in docs for autodeployment
Build and Publish / build (push) Successful in 23s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-01-05 16:01:16 +01:00
appleb_m 42b9514a12 moved docs to daq, updated workflow
Build and Publish / build (push) Successful in 22s
Build and Publish / Build and Deploy Docs (push) Failing after 36s
2026-01-05 13:31:03 +01:00
appleb_m ff652ec5ed Update VERSION to 0.2.69
Build and Publish / build (push) Successful in 25s
2025-12-22 13:54:53 +01:00
appleb_m 10d378f0d1 Tell: logger.debug stateements to see waht wait_ready does. Seems to not work. keeping for now until we fix. 2025-12-22 09:42:47 +01:00
appleb_m 735ec7514b DAQ: removed superfluos comment 2025-12-22 09:38:28 +01:00
appleb_m c40fa4f56a DAQ: added logic for axcfailed statement 2025-12-22 09:38:15 +01:00
appleb_m bca98172a9 DAQ: added try except to ingest statements so if they fail data is still displayed in the GUI. 2025-12-22 09:37:23 +01:00
appleb_m 300e719167 DAQ: moved wait_ready() earlier to see if this resolves a robot timing issue with the gripper. The different wait comamnds ahve simialr logic but seem to break. Needs exploring in the new year. 2025-12-22 09:35:24 +01:00
appleb_m 92428ff2fa DAQ: bug where has_sufficient_low_res_spots was not imported. 2025-12-22 09:34:24 +01:00
appleb_m 7a9411d0cd DAQ: added class variable for the min low spots threshold 2025-12-22 09:33:46 +01:00
appleb_m 2a54ee43d3 DAQ: added error handling for raster if spots less than a thresh-hold. Currently commented as it affects manual users, should only be used in automation. 2025-12-22 09:33:26 +01:00
appleb_m 7acba275ba DAQ: updated mount failure logic and error handling. 2025-12-22 09:31:33 +01:00
appleb_m 82ba3a4412 DAQ: added AXCFailed exception class. This needs tidyign up in Jan 2025-12-22 09:30:49 +01:00
appleb_m 90545a420b DAQ: robot dry and park on repeated mount failures 2025-12-22 09:30:27 +01:00
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