Commit Graph
383 Commits
Author SHA1 Message Date
appleb_m aaa00d030f GUI: automation progress widget bug fix where it sometimes wouldn't update if automation paused or finished.
Build and Publish / test (push) Successful in 1m54s
Build and Publish / build (push) Successful in 15s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-05-01 18:07:50 +02:00
appleb_m 8b441b4bff GUI: automation progress widget updates 2026-05-01 17:51:43 +02:00
appleb_m 65b765f870 COMMON: beamline new get_jfjoch_url helper correction to match legacy code
Build and Publish / test (push) Successful in 1m58s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-05-01 16:53:38 +02:00
appleb_m bda5a0c820 DAQ: placeholder scripts for daq refactor 2026-05-01 16:53:17 +02:00
appleb_m 856c2ba34b DAQ/GUI: removed automation workflow manager runner, workflow, models and tidied up GUI/DAQ as it is not in use at the moment. 2026-05-01 16:53:03 +02:00
appleb_m b99635b22e DAQ: todo reminders for rastering 2026-05-01 16:20:42 +02:00
appleb_m 499897cb46 JFJOCH: centralize URL resolution 2026-05-01 16:20:28 +02:00
appleb_m e84e2db32b DAQ: add simulate_raster.py for no-beam/simualted detector 2026-05-01 15:45:01 +02:00
appleb_m d8567c419e DAQ: assert result from execute_face_detection 2026-05-01 15:43:32 +02:00
appleb_m 2bb3ea4e1e GUI: added a todo reminder for when there is beam 2026-05-01 15:43:13 +02:00
appleb_m e27d938236 DAQ: updates to find_xtal.py 2026-05-01 15:42:18 +02:00
appleb_m fcb615255f GUI: fix bug in rotationdatacollection for single image screening 2026-05-01 14:29:13 +02:00
appleb_m ed17af9dec GUI: park and dry toggle when automation finishes. 2026-05-01 14:28:49 +02:00
appleb_m f4718d396c DAQ: fix bug in TransformationInvalidException handling and pass this to GUI to stop automation if critical error occurs 2026-05-01 14:28:20 +02:00
appleb_m 16fe6e9ef4 DAQ: fix bug in facedetection if result is None.
Build and Publish / test (push) Successful in 1m30s
Build and Publish / build (push) Successful in 17s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-05-01 14:24:57 +02:00
appleb_m 34e8a4bfd5 GUI: added cleaunp, fixed recovery_action bug 2026-05-01 10:39:20 +02:00
appleb_m 55e0f7893a workflows: added maintenance2sa and maintenance2se methods 2026-05-01 10:38:37 +02:00
appleb_m 56c6675991 DAQ: added more explicit errors in workflows to identify which transformation failed, from where to where 2026-05-01 10:38:13 +02:00
appleb_m afbc672c77 DAQ: enabled face dtection messages to db. updated aaredb requirement to 0.1.1a49
Build and Publish / test (push) Failing after 1m20s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-30 17:09:10 +02:00
appleb_m 65f5205e6f DAQ: updated AutoExposureSettings defaults 2026-04-30 17:07:41 +02:00
appleb_m 1865fd3dea DAQ/GUI: updated gui session managmmenet so baton holder is shown in GUI and gui sessions are closed and removed from redis
Build and Publish / test (push) Successful in 1m26s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-04-30 17:07:03 +02:00
appleb_m 947e142f6e DAQ/GUI updated: gui session handling in daq and gui so staff can now close erroneous GUIs and see who has the baton. Added tests
Build and Publish / test (push) Successful in 1m26s
Build and Publish / build (push) Successful in 15s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-04-30 14:03:10 +02:00
appleb_m 8cd26d54b7 Face_detection: bug in pytest due to same names, refactored face_detection scripts to be utils in daq/operations/face_detection
Build and Publish / test (push) Successful in 1m20s
Build and Publish / build (push) Successful in 14s
Build and Publish / Build and Deploy Docs (push) Successful in 37s
2026-04-30 13:39:25 +02:00
appleb_m 6095dee54a DAQ: bug in using enums for area_detector fixed
Build and Publish / test (push) Failing after 1m5s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-30 13:11:12 +02:00
appleb_m 71de09a11f DAQ: corrected pvs for area detector aoi settings and white balance correction, using enums for manual and auto_once 2026-04-30 13:01:46 +02:00
appleb_m a00f0b3dff DAQ: updated face_detection added operations/face_detection fodler including service and models, new tests of face_detection
Build and Publish / test (push) Failing after 1m4s
Build and Publish / Build and Deploy Docs (push) Has been skipped
Build and Publish / build (push) Has been skipped
2026-04-30 12:44:55 +02:00
appleb_m 2b7c634227 GUI/DAQ: track active guis and allow staff to force close sessions if needed. GUI's should autoclose if no interaction or uaomation after a grace period. REDIS should clear close GUIS after 10 minutes of no status updates
Build and Publish / test (push) Successful in 1m23s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-04-30 12:44:02 +02:00
appleb_m df84850941 Update to version 0.3.1
Build and Publish / test (push) Successful in 1m31s
Build and Publish / build (push) Successful in 17s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-04-29 17:34:41 +02:00
appleb_m 07451b5aa3 LOOP_CENTERING: split loop centering from main daq script and add unit tests 2026-04-29 17:23:03 +02:00
appleb_m 2c2221ce31 raster/rotation: wait until running jfjoch added, order in which events occur changes so detector intiailisation starts while beamline is being configured 2026-04-29 17:22:22 +02:00
appleb_m 715b8ba417 mount_handling: added mount_handler and mount_fail_handler as well as redis mount_count, WIP 2026-04-29 17:20:57 +02:00
appleb_m 84bb350d21 automation_api_router.py: remove superfluous imports 2026-04-29 17:19:04 +02:00
appleb_m c1db7a8d8a DAQ: refactored MLBOX and loop_Centering MLBOXTYPe. Loop_centering should no longer move if the only class found is pin, ice or needle. Refactored tests.
Build and Publish / test (push) Successful in 1m18s
Build and Publish / build (push) Successful in 14s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-04-28 15:23:24 +02:00
appleb_m 29a8f8198f DAQ: added screenshot wait argument to raster and loop_centre, howerever it should be in screenshot itself, to be updated 2026-04-28 15:07:44 +02:00
appleb_m ff772ef487 DAQ: added back mount_handler logic - to be tested. 2026-04-28 15:07:15 +02:00
appleb_m b212f0d081 workflows: allow xtal_snapshot to go to any state 2026-04-28 14:28:53 +02:00
appleb_m d307b049bc gitea: fix os error in login.py and auth.py
Build and Publish / test (push) Successful in 1m29s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-04-28 14:25:03 +02:00
appleb_m 98fba7ec53 jfjoch: refactored so fomrat_dataset_settings is one funcution, added newenum for scantypes. 2026-04-28 14:14:18 +02:00
appleb_m 386df67557 jfjoch: added new wait_till_running method and updated wait_tilldone logging 2026-04-28 14:13:58 +02:00
appleb_m 4ac17f1117 facedetection - catch warning if doesnt tend towards a fit 2026-04-28 14:13:06 +02:00
appleb_m 9df27b3a13 spreadsheetupdater.py updated json to moduel_dump_json 2026-04-28 14:11:44 +02:00
appleb_m 9cc11597d7 gitea workflows: updated conftest adn becworker to handle no pxii_bec import
Build and Publish / test (push) Failing after 1m13s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-28 13:31:24 +02:00
appleb_m bef4193d8f gitea workflows: updated pyproject toml dependencies, tellupdater updates and fix error in test_beamcenter_fit_no_contours
Build and Publish / test (push) Failing after 1m43s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-27 17:20:29 +02:00
appleb_m 02cfbde470 gitea workflows: tellupdater dependendency on mx_beamline() moved to if __name__=="main". and put if name is None: return MXBeamline.SIMULATED.
Build and Publish / test (push) Failing after 1m32s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-27 17:08:08 +02:00
appleb_m c9463583bc gitea workflows: added missing dependency imports, remove redundant mlbox_logic test, update workdflows and bec_worker due to local import
Build and Publish / test (push) Failing after 1m11s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-27 16:58:38 +02:00
appleb_m 93c88ef0cf gitea workflows: added logging_dev.yaml
Build and Publish / test (push) Failing after 1m5s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-27 14:36:00 +02:00
appleb_m 6aaf13ea4f gui: now gui.py is wrapped ina main() function. allows for better tests 2026-04-27 11:56:30 +02:00
appleb_m 9653f7c974 daq: testing helpers to make some functions noncritical and therefore not break automation... 2026-04-27 11:56:07 +02:00
appleb_m ba86ab4663 daq: fixed bug in mount where if current sample was manual it had no tell address so could not be set as "unmounted" - even if it was unmounted already. 2026-04-27 11:55:31 +02:00
appleb_m 828e534e49 raster: catch diffracton_iamge_get error, but allow automation etc to continue 2026-04-27 11:54:34 +02:00