 appleb_m
|
e7201f7c0f
|
DAQ: added common operation helpeers
|
2026-05-22 15:23:45 +02:00 |
|
|
appleb_m
|
7cbbf7942a
|
DAQ: added screenshot service handler
|
2026-05-22 15:23:32 +02:00 |
|
|
appleb_m
|
362c8a2977
|
DAQ: added runtime protocols
|
2026-05-22 15:23:03 +02:00 |
|
|
appleb_m
|
9d973a0751
|
DAQ: added exception handling too beamline status to avoid suprressing errors. This should now catch any unhandlled error, while giving defaultts for aerotech, smargon and tell which will give a banner and erro state in the GUI
Build and Publish / test (push) Successful in 1m24s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
|
2026-05-21 14:07:19 +02:00 |
|
|
appleb_m
|
f789a0e917
|
logging: defualt location changed back to ~/tmp/mxlogs/ as GUI also uses this path. The shared location leads to permissions errors. Needs a long term fix.
|
2026-05-21 14:06:27 +02:00 |
|
|
appleb_m
|
9ce13f8bf5
|
logging: defualt location changed back to ~/tmp/mxlogs/ as GUI also uses this path. The shared location leads to permissions errors. Needs a long term fix.
|
2026-05-21 10:18:37 +02:00 |
|
|
appleb_m
|
7b92686263
|
DAQ: MAJOR: Refactored mounting service
|
2026-05-21 10:18:04 +02:00 |
|
|
appleb_m
|
0b03c984bd
|
DAQ: MAJOR: Refactored mounting service
|
2026-05-20 16:11:44 +02:00 |
|
|
appleb_m
|
ff609bc68d
|
DAQ: added end points for local contact panel, needs fixing
|
2026-05-20 16:11:33 +02:00 |
|
|
appleb_m
|
b250e69fef
|
DAQ: trying a different logging location
|
2026-05-20 16:11:20 +02:00 |
|
|
appleb_m
|
7847b5a98e
|
DAQ/GUI: fixed local_contact_panel.py, exception handling for state transition errors, added transition to BEC maintenance mode, and wired or added palce holder functions for local contact panel
Build and Publish / test (push) Successful in 1m20s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
|
2026-05-20 15:50:16 +02:00 |
|
|
appleb_m
|
f77faef534
|
tests: fixed tellupdater and workflows tests
Build and Publish / test (push) Successful in 1m39s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 37s
|
2026-05-20 15:15:02 +02:00 |
|
|
appleb_m
|
b744fce6de
|
Merge remote-tracking branch 'origin/master'
Build and Publish / test (push) Failing after 1m31s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
# Conflicts:
# src/aare/gui/main_window.py
|
2026-05-20 13:55:45 +02:00 |
|
 Martin Appleby
|
e86fbb3d9f
|
DAQ: added loco panel and commands such as tell dry to GUI and DAQ
Build and Publish / test (push) Failing after 1m36s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
|
2026-05-20 13:54:28 +02:00 |
|
|
appleb_m
|
0d5f34c0c1
|
BEC: added better exception hadnling
|
2026-05-20 11:49:58 +02:00 |
|
|
appleb_m
|
6990d94a7f
|
GUI: daq_worker surppress 403 errros and also adjust message when step failed.
|
2026-05-20 11:49:46 +02:00 |
|
|
appleb_m
|
78d8341a02
|
devices: timing auto exposure
|
2026-05-20 11:49:21 +02:00 |
|
|
appleb_m
|
0b40369f29
|
workflows: added detector moves.
|
2026-05-20 11:49:07 +02:00 |
|
|
appleb_m
|
c7192909bb
|
workflows: added set cam settings for xtal_snapshot - however if backlight fails this does not work. added detector moves.
|
2026-05-20 11:48:59 +02:00 |
|
|
appleb_m
|
8c92cf1c49
|
loop_centerL adjust default screenshot wait time
|
2026-05-20 11:48:13 +02:00 |
|
|
appleb_m
|
6857275a13
|
jfjoch: exception catching.
|
2026-05-20 11:47:53 +02:00 |
|
|
appleb_m
|
3679e70a51
|
Status_bar: aesthitics changes
|
2026-05-20 11:47:26 +02:00 |
|
|
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 |
|