ab4dd89486
GUI: added controls for mono_picth_scan and change_energy
appleb_m2026-05-12 17:05:07 +02:00
36a633a291
COmmon: added yaml files, moved logging yamls to common/config/
appleb_m2026-05-12 17:04:02 +02:00
d9558b980a
DAQ: changed handling and formatting of tell client mount values. and added b ack mount fail handler - to be tested!
appleb_m2026-05-11 16:09:41 +02:00
e744ecda21
DAQ: cleaned up aeradetector script and stop acquisition before auto_exposure and initialising.
appleb_m2026-05-11 16:07:55 +02:00
8413599eaa
GUI: moved loop centering and ml box buttosn to under data collection settings. Reduced size of beamline state panel
appleb_m2026-05-11 16:07:14 +02:00
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.
appleb_m2026-05-08 13:13:36 +02:00
ad5d0ab667
Exceptions: corrected Mounting error in server exception handling
appleb_m2026-05-08 13:10:46 +02:00
5d60ebf4ef
Exceptions: added AutoRasterSampleSkipped for automation
appleb_m2026-05-08 13:10:20 +02:00
c31a60fb1c
Exceptions: added BeamlineBusyTimeoutException, primarily for automation
appleb_m2026-05-08 11:34:05 +02:00
cf184d765c
Face_detectrion: service.py tidying up logging, changed status of some mesages form infor to debug.
appleb_m2026-05-08 11:33:42 +02:00
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
appleb_m2026-05-04 17:01:56 +02:00
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.
appleb_m2026-05-04 17:01:07 +02:00
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.
appleb_m2026-05-04 15:36:20 +02:00
c60db6798a
GUI: tidied up automation panel and made it a little prettier. added timing to events
appleb_m2026-05-04 11:11:17 +02:00
e396b7e6a0
tellupdater.py: writing tell events in redis and updating test cases
GotthardG2026-05-04 11:01:44 +02:00
7d8eedbb12
tellupdater.py: better handling of exceptions and logging for TELL events.
GotthardG2026-05-04 09:17:15 +02:00
501a810c11
tellupdater.py: adding listening to more TELL events
GotthardG2026-05-04 08:53:47 +02:00
aaa00d030f
GUI: automation progress widget bug fix where it sometimes wouldn't update if automation paused or finished.
appleb_m2026-05-01 18:07:50 +02:00
65b765f870
COMMON: beamline new get_jfjoch_url helper correction to match legacy code
appleb_m2026-05-01 16:53:38 +02:00
bda5a0c820
DAQ: placeholder scripts for daq refactor
appleb_m2026-05-01 16:53:17 +02:00
856c2ba34b
DAQ/GUI: removed automation workflow manager runner, workflow, models and tidied up GUI/DAQ as it is not in use at the moment.
appleb_m2026-05-01 16:53:03 +02:00
f1b7cf35d9
tests: AutomationProgressPanel test
appleb_m2026-05-01 16:20:58 +02:00
b99635b22e
DAQ: todo reminders for rastering
appleb_m2026-05-01 16:20:42 +02:00
e84e2db32b
DAQ: add simulate_raster.py for no-beam/simualted detector
appleb_m2026-05-01 15:45:01 +02:00
d8567c419e
DAQ: assert result from execute_face_detection
appleb_m2026-05-01 15:43:32 +02:00
2bb3ea4e1e
GUI: added a todo reminder for when there is beam
appleb_m2026-05-01 15:43:13 +02:00
e27d938236
DAQ: updates to find_xtal.py
appleb_m2026-05-01 15:42:18 +02:00
fcb615255f
GUI: fix bug in rotationdatacollection for single image screening
appleb_m2026-05-01 14:29:13 +02:00
ed17af9dec
GUI: park and dry toggle when automation finishes.
appleb_m2026-05-01 14:28:49 +02:00
f4718d396c
DAQ: fix bug in TransformationInvalidException handling and pass this to GUI to stop automation if critical error occurs
appleb_m2026-05-01 14:28:20 +02:00
16fe6e9ef4
DAQ: fix bug in facedetection if result is None.
appleb_m2026-05-01 14:24:57 +02:00
55e0f7893a
workflows: added maintenance2sa and maintenance2se methods
appleb_m2026-05-01 10:38:37 +02:00
56c6675991
DAQ: added more explicit errors in workflows to identify which transformation failed, from where to where
appleb_m2026-05-01 10:38:13 +02:00
afbc672c77
DAQ: enabled face dtection messages to db. updated aaredb requirement to 0.1.1a49
appleb_m2026-04-30 17:09:10 +02:00
1865fd3dea
DAQ/GUI: updated gui session managmmenet so baton holder is shown in GUI and gui sessions are closed and removed from redis
appleb_m2026-04-30 17:07:03 +02:00
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
appleb_m2026-04-30 14:03:10 +02:00
8cd26d54b7
Face_detection: bug in pytest due to same names, refactored face_detection scripts to be utils in daq/operations/face_detection
appleb_m2026-04-30 13:39:25 +02:00
6095dee54a
DAQ: bug in using enums for area_detector fixed
appleb_m2026-04-30 13:11:12 +02:00
71de09a11f
DAQ: corrected pvs for area detector aoi settings and white balance correction, using enums for manual and auto_once
appleb_m2026-04-30 13:01:46 +02:00
a00f0b3dff
DAQ: updated face_detection added operations/face_detection fodler including service and models, new tests of face_detection
appleb_m2026-04-30 12:44:55 +02:00
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
appleb_m2026-04-30 12:44:02 +02:00
07451b5aa3
LOOP_CENTERING: split loop centering from main daq script and add unit tests
appleb_m2026-04-29 17:23:03 +02:00
2c2221ce31
raster/rotation: wait until running jfjoch added, order in which events occur changes so detector intiailisation starts while beamline is being configured
appleb_m2026-04-29 17:22:22 +02:00
715b8ba417
mount_handling: added mount_handler and mount_fail_handler as well as redis mount_count, WIP
appleb_m2026-04-29 17:20:57 +02:00
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.
appleb_m2026-04-28 15:23:24 +02:00
29a8f8198f
DAQ: added screenshot wait argument to raster and loop_centre, howerever it should be in screenshot itself, to be updated
appleb_m2026-04-28 15:07:44 +02:00
ff772ef487
DAQ: added back mount_handler logic - to be tested.
appleb_m2026-04-28 15:07:15 +02:00
95384d175a
test: fixed bug in workflow test
appleb_m2026-04-28 15:01:58 +02:00
9cc11597d7
gitea workflows: updated conftest adn becworker to handle no pxii_bec import
appleb_m2026-04-28 13:31:24 +02:00
bef4193d8f
gitea workflows: updated pyproject toml dependencies, tellupdater updates and fix error in test_beamcenter_fit_no_contours
appleb_m2026-04-27 17:20:29 +02:00
02cfbde470
gitea workflows: tellupdater dependendency on mx_beamline() moved to if __name__=="main". and put if name is None: return MXBeamline.SIMULATED.
appleb_m2026-04-27 17:08:08 +02:00
e76be9fe25
gitea workflows: MX_BEAMLINE should be BEAMLINE
appleb_m2026-04-27 17:01:36 +02:00
c9463583bc
gitea workflows: added missing dependency imports, remove redundant mlbox_logic test, update workdflows and bec_worker due to local import
appleb_m2026-04-27 16:58:38 +02:00
appleb_m
GotthardG