bae400e9c3
diffraction_geometry.py: added a if __name__ == "__main__": block for testing
appleb_m2026-06-02 10:31:22 +02:00
1bba68f2ed
ml_box: enabled ml box for 6D beamline
appleb_m2026-06-02 10:28:44 +02:00
ce93d1502b
scan_settings_panel.py: added a note to make min and max dtx in GUI and DAQ beamline dependnet and taken from yaml file
appleb_m2026-06-02 10:28:19 +02:00
f05ab28240
test: corrected test for aaredb to use db_id
appleb_m2026-06-02 10:27:34 +02:00
cfcabac6cf
ytaml: converted to sls-gpu-003 for samcam and predicitions. Updated aerotech url for 6D
appleb_m2026-06-02 10:27:20 +02:00
63a4058ccb
tests: fixed operation tests after refactoring and added runtime state
appleb_m2026-06-02 10:26:42 +02:00
c971f70814
tell_client.py: added more explicit logging and a catch all error for wait_events, May remove this,
appleb_m2026-05-29 10:10:27 +02:00
2715f4694e
daq: add blower on command to every mount event
appleb_m2026-05-29 10:07:53 +02:00
95e3ecbcea
refactor of send_sample_event
appleb_m2026-05-29 10:07:40 +02:00
792f72cb22
sam_cam: tempoarly removed auto white balance on daq start up, may be better to set to a specific value
appleb_m2026-05-29 10:06:49 +02:00
401ec84df4
aaredb.py: refactored send_sample_event to use sample_id and not s
appleb_m2026-05-29 10:05:24 +02:00
a8b4bde605
workflows.py: tempoary protection for det_z on x10s, needs to be beamline specific and probably in the detector move call.
appleb_m2026-05-29 10:04:44 +02:00
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
appleb_m2026-05-21 14:07:19 +02:00
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.
appleb_m2026-05-21 14:06:27 +02:00
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.
appleb_m2026-05-21 10:18:37 +02:00
7b92686263
DAQ: MAJOR: Refactored mounting service
appleb_m2026-05-21 10:18:04 +02:00
0b03c984bd
DAQ: MAJOR: Refactored mounting service
appleb_m2026-05-20 16:11:44 +02:00
ff609bc68d
DAQ: added end points for local contact panel, needs fixing
appleb_m2026-05-20 16:11:33 +02:00
b250e69fef
DAQ: trying a different logging location
appleb_m2026-05-20 16:11:20 +02:00
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
appleb_m2026-05-20 15:50:16 +02:00
f77faef534
tests: fixed tellupdater and workflows tests
appleb_m2026-05-20 15:15:02 +02:00
c7192909bb
workflows: added set cam settings for xtal_snapshot - however if backlight fails this does not work. added detector moves.
appleb_m2026-05-20 11:48:59 +02:00
8c92cf1c49
loop_centerL adjust default screenshot wait time
appleb_m2026-05-20 11:48:13 +02:00
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
appleb_m
Martin Appleby