Commit Graph
1119 Commits
Author SHA1 Message Date
appleb_m b603832c4d Logger config_ surpress 403 errors from face_detection and auomtation as this is caused by permissions 2026-05-20 11:46:56 +02:00
appleb_m 3fa4a57532 DAQ: added StateTransitionFailed and Maintenance Exceptions. ALso BECCommunicationException 2026-05-20 11:46:34 +02:00
appleb_m c60d2b5303 Exceptions: added StateTransitionFailed and Maintenance Exceptions. ALso BECCommunicationException 2026-05-20 11:46:04 +02:00
appleb_m e07b5bc9c5 Merge remote-tracking branch 'origin/master' 2026-05-13 12:27:30 +02:00
GotthardG 42e6e3e942 tellupdater.py: writing tell events in redis and updating test cases
Build and Publish / test (push) Failing after 1m28s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-05-13 12:27:10 +02:00
appleb_m 3c909b4017 GUI: tidy up daq worker imports 2026-05-13 11:15:00 +02:00
appleb_m 492ed28a8a COMMON: updated yamls, implemented hardware url for gui, jfjoch, aerotech, bec, smargon and tell. 2026-05-13 10:41:34 +02:00
appleb_m dcdddbd546 daq: added safety to tell mount handling 2026-05-12 17:06:39 +02:00
appleb_m cb579f6265 devices: added cryjet_temp pvs 2026-05-12 17:06:04 +02:00
appleb_m 632c1ceff2 Tell: updated error handlign in unmount 2026-05-12 17:05:42 +02:00
appleb_m a413df48eb DAQ: removed automation 1 dependency 2026-05-12 17:05:19 +02:00
appleb_m ab4dd89486 GUI: added controls for mono_picth_scan and change_energy 2026-05-12 17:05:07 +02:00
appleb_m 36a633a291 COmmon: added yaml files, moved logging yamls to common/config/ 2026-05-12 17:04:02 +02:00
appleb_m d9558b980a DAQ: changed handling and formatting of tell client mount values. and added b ack mount fail handler - to be tested! 2026-05-11 16:09:41 +02:00
appleb_m 5f81f0046f GUI: changed feeling luckly button to x-ray centering 2026-05-11 16:09:11 +02:00
appleb_m f16316366a DAQ: updated tests and face_dectection service to fix a bug 2026-05-11 16:08:59 +02:00
appleb_m 31d469073f DAQ: bec_worker added change_energy and mono_pitch_scan_runner methods 2026-05-11 16:08:28 +02:00
appleb_m e744ecda21 DAQ: cleaned up aeradetector script and stop acquisition before auto_exposure and initialising. 2026-05-11 16:07:55 +02:00
appleb_m 8413599eaa GUI: moved loop centering and ml box buttosn to under data collection settings. Reduced size of beamline state panel 2026-05-11 16:07:14 +02:00
appleb_m c4c8214957 DAQ: for large grids we were hitting a busy tiemout exception - have uppded the tiemout to 10 minutes, have added busy state timeout exceptions and now skip samples if raster too large - or when starting the DAQ can toggle this off so that we scale the grid instead to the max number of images - set to jungfrau buffer limit of 4500 iamges, needs testing.
Build and Publish / test (push) Failing after 1m23s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-05-08 13:13:36 +02:00
appleb_m ad5d0ab667 Exceptions: corrected Mounting error in server exception handling 2026-05-08 13:10:46 +02:00
appleb_m 5d60ebf4ef Exceptions: added AutoRasterSampleSkipped for automation 2026-05-08 13:10:20 +02:00
appleb_m c31a60fb1c Exceptions: added BeamlineBusyTimeoutException, primarily for automation 2026-05-08 11:34:05 +02:00
appleb_m cf184d765c Face_detectrion: service.py tidying up logging, changed status of some mesages form infor to debug. 2026-05-08 11:33:42 +02:00
appleb_m 8018e769c0 DAQ: visualisation of tell state added to GUI, now updates BUSY label with current Tell action, when possible. THisd only overlays sample camera at the moment.Can also be seen on status abr, beamlien state panel adn beamlien recovery panel
Build and Publish / test (push) Successful in 1m27s
Build and Publish / build (push) Successful in 17s
Build and Publish / Build and Deploy Docs (push) Successful in 37s
2026-05-04 17:01:56 +02:00
appleb_m a82a083c67 DAQ: added tell_state handler that creates states based on sse stream from tell in redis. Currently not used in logc, tracking for debugging before implementing. 2026-05-04 17:01:07 +02:00
appleb_m e99681ddd8 DAQ: handle critical detector errors, GUI now intercepts and halts automation. Should also throw an error when a detector has a fault during manual collection.
Build and Publish / test (push) Successful in 8m9s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 34s
2026-05-04 15:36:20 +02:00
appleb_m c60db6798a GUI: tidied up automation panel and made it a little prettier. added timing to events 2026-05-04 11:11:17 +02:00
GotthardG e396b7e6a0 tellupdater.py: writing tell events in redis and updating test cases
Build and Publish / test (push) Successful in 2m21s
Build and Publish / build (push) Successful in 14s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-05-04 11:01:44 +02:00
GotthardG 7d8eedbb12 tellupdater.py: better handling of exceptions and logging for TELL events.
Build and Publish / test (push) Successful in 4m16s
Build and Publish / build (push) Successful in 15s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-05-04 09:17:15 +02:00
GotthardG 501a810c11 tellupdater.py: adding listening to more TELL events 2026-05-04 08:53:47 +02:00
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 f1b7cf35d9 tests: AutomationProgressPanel test 2026-05-01 16:20:58 +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