6aaf13ea4f
gui: now gui.py is wrapped ina main() function. allows for better tests
appleb_m2026-04-27 11:56:30 +02:00
9653f7c974
daq: testing helpers to make some functions noncritical and therefore not break automation...
appleb_m2026-04-27 11:56:07 +02:00
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.
appleb_m2026-04-27 11:55:31 +02:00
828e534e49
raster: catch diffracton_iamge_get error, but allow automation etc to continue
appleb_m2026-04-27 11:54:34 +02:00
e6e514ec2a
JFJOCH: added retry to get_diffraction_image with wait_between_retries_s default of 0.1 s
appleb_m2026-04-27 11:53:33 +02:00
2e89d6d1ec
workflow_tools.py - fixed sevveral bugs in wait_position where eval would cause an exception but shouldnt
appleb_m2026-04-27 11:51:34 +02:00
cc2c339210
autofocus_tools.py: fixed bug so mask.sum() always prints
appleb_m2026-04-27 11:50:50 +02:00
e942fc71ea
add a mock grid simulation option at no_beam condition, default to be false
duan_j2026-04-24 17:03:01 +02:00
b8ee008477
logging: attempted to standardise logging, in particular timing of functions with a wrapper, focus on raster and timing at the moment.
appleb_m2026-04-24 14:53:09 +02:00
c73075fb7f
tests: removed time_db tests from aaredb as have standardised this wrapper
appleb_m2026-04-24 14:52:16 +02:00
7168f5512d
tests: added gui tests and furtehr tests in daq and common
appleb_m2026-04-24 14:52:00 +02:00
3b39bb2144
raster: now do auto_centre_line_scan based off of target_y instead of just above and below beam cente, if target avaialble, now submit iamges to databse, reduced number of significant figures inr aster message to db, grid_to_image and iamge_to_grid fucntions
appleb_m2026-04-24 14:19:36 +02:00
d856b77b7d
beamcenterfit.py: return None instead of exit()
appleb_m2026-04-24 14:17:38 +02:00
6ca853bc17
tests: added aaredb wrapper test
appleb_m2026-04-24 11:48:54 +02:00
8e4a5906bf
aaredb: added a timeing debug wrapper to aaredb, to track responses. Removed ToDos!
appleb_m2026-04-24 11:48:31 +02:00
1649d6e1a4
aaredb: fixed a bug in case the payload_model is None.
appleb_m2026-04-24 11:46:58 +02:00
37b6755410
DAQ: now sending mounting and unmounting messages to database
appleb_m2026-04-24 11:15:57 +02:00
761d78a918
DAQ: raster, fix bug where there was an incorrect state call, added wait varaible before screenshot, default set to 200 ms.
appleb_m2026-04-24 11:07:41 +02:00
864f195c71
tests: added tests for coordinate and models
appleb_m2026-04-24 11:01:39 +02:00
c233bd333d
tests: added tests for daq_server, error_codes, exception_handler and tell_client
appleb_m2026-04-24 10:48:09 +02:00
e5ffbb9b18
Server: updated server_exception_handler.py and also error_codes.py to cover all custom exceptions
appleb_m2026-04-23 17:22:36 +02:00
0685d35086
TELL: moved custom exceptions from backend to common/exception_handler
appleb_m2026-04-23 17:22:14 +02:00
900b123645
GUI: wired in new state changes for beamline state panel
appleb_m2026-04-23 17:21:38 +02:00
8fe5183f8e
GUI/DAQ: allowed beamline_state_panel to move to states such as DC and RSE if transitiion is allowed (harder to define)
appleb_m2026-04-23 17:21:19 +02:00
1cdb39af73
Workflows: xtalSNapshot settings in progress
appleb_m2026-04-23 13:49:58 +02:00
02ceb63a7a
DAQ/GUI: fixed a raster bug where it was either moving to smargon 0, or not moving to the start of the mlbox.
appleb_m2026-04-23 13:49:43 +02:00
9c15a7ac5e
DAQ: big update, added an automation progress panel to the gui, and wired it up. IT is now using redis persistently across multiple workers.
appleb_m2026-04-23 13:49:15 +02:00
d7c7d03788
DAQ: fixed bugs in raster calls and updated error handling in raster and rotation scans
appleb_m2026-04-23 11:00:32 +02:00
17815b1503
DAQ: added new exceptions to exception_handler.py for raster and data collection
appleb_m2026-04-23 10:59:58 +02:00
2a31544aba
GUI: added beamline_state_panel.py with station widgets to GUI
appleb_m2026-04-23 10:59:17 +02:00
45aa58c1f7
GUI: status bar uses new BeamlineStateEnum display_name
appleb_m2026-04-23 10:58:39 +02:00
43105ebc3b
Models: beamline state enum now has a function called display name to give uniform strings whenever needed
appleb_m2026-04-23 10:58:24 +02:00
9938ba74a0
DAQ: added initialisation for auto exposure in DAQ devices
appleb_m2026-04-23 10:57:14 +02:00
c4ea023f8e
DAQ: refactored measure_raster to use auto_center flag instead of auto to be more explicit and to avoid shadowing outer scope
appleb_m2026-04-23 08:12:54 +02:00
3a7b8cef55
tests: updated conftest to include qapp fixture
appleb_m2026-04-22 16:59:53 +02:00
6e2023cefa
tests: added more tests, pytest ini options in pyporject toml
appleb_m2026-04-22 16:59:30 +02:00
2fc25cc7f5
spreadsheetupdater.py: only check for password when needing WSHEADERS
appleb_m2026-04-22 16:57:32 +02:00
6db8f281e6
SCRIPTS:moved two scripts and renamed so it does not hit the pytest
appleb_m2026-04-22 16:57:09 +02:00
3ea95367ed
SCRIPTS:moved two scripts and renamed so it does not hit the pytest
appleb_m2026-04-22 16:56:11 +02:00
1b18536699
SCRIPTS: removed old aerotech test script
appleb_m2026-04-22 16:18:14 +02:00
64b7089ed4
GUI: todo note - if we use zmq and pred stream form same source can we combine instead of having two image streams?
appleb_m2026-04-22 16:09:12 +02:00
c398afa6b6
DAQ: organising operation handlers, state changes
appleb_m2026-04-22 16:08:34 +02:00
405806518c
DAQ: trying to tidy up aaredb error communication in raster scans
appleb_m2026-04-22 16:06:41 +02:00
1df0ada163
GUI: added shortcuts and to info to the README.md
appleb_m2026-04-22 16:05:57 +02:00
7e0a27f992
GUI: added shortcuts and a helper
appleb_m2026-04-22 16:05:37 +02:00
2802a72e43
Workflows: added some state changes, trialing auto_exposure, todo how to safely, or more safely import bec macros
appleb_m2026-04-22 16:05:21 +02:00
8698d4e495
DAQ/Server: added auto_exposure end point, removed commented out code from autofocus and started a blower_control function
appleb_m2026-04-22 16:03:31 +02:00
2ccb3aa7ae
TESTS: added some simple tests to the GUI
appleb_m2026-04-22 15:59:55 +02:00
c780a6aedb
tell: added anneal in and out plus blower toggle
appleb_m2026-04-22 13:26:59 +02:00
b9b253f6fb
GUI: improved performance for prediction subscriber, prediction_metrics_panel.py and target_stability_panel.py.
appleb_m2026-04-22 11:35:44 +02:00
3c4a500b4c
GUI: Improved performance of GUI with large reaster grids by throttle Raster grid drawing to 25 Hz, change geometry of the drawn grid only to imrpove speed - draw less lines particulalrly when cells are less than 2 px.
appleb_m2026-04-22 11:27:57 +02:00
c05969a02b
TELL: added http exception hadnling so we don't swallow tell errors. Added pin blower control functions.
appleb_m2026-04-22 10:19:52 +02:00
2920a38647
GUI: wired panels into main_window and added to Qswettings, Qsettings needs tidying
appleb_m2026-04-22 10:19:01 +02:00
80008891ef
GUI: added a target stability panel and a predicition metrics panel - needs tidying!
appleb_m2026-04-22 10:18:39 +02:00
9a1030a2aa
aarelc_infer.py: will eventually use gpu-003
appleb_m2026-04-22 10:17:54 +02:00
a5603918d1
GUI: seperated out show polygons from show detections
appleb_m2026-04-22 10:12:24 +02:00
39e53d65cd
DAQ: changes to ALC to handle Sample ShortInfo instead of sample.db_id. Debugging of ALC logic in progress
appleb_m2026-04-22 10:11:21 +02:00
0d0953c74c
DAQ\/AareDB: centralise message handling to the database
appleb_m2026-04-22 10:10:44 +02:00
a7b83e7a9d
GUI: added legend to the GUI, target position display.
appleb_m2026-04-20 17:26:49 +02:00
5cbc0171f3
GUI: visualisation of target position added to GUI
appleb_m2026-04-20 16:14:18 +02:00
6e5de34d46
BEC: bug in generating the states for the statemanager - fixed
appleb_m2026-04-20 16:14:02 +02:00
a0aff79675
GUI: added protection against smargon and raster moves while camera is off
appleb_m2026-04-20 15:21:43 +02:00
0bbe070776
Logging: suprress sample/reference_tools and sample/spreadsheet success messages but keep failures. Should be disabled when debugging.
appleb_m2026-04-20 12:06:05 +02:00
65e6e22e2d
Exceptions: added an UnmountingFailed exception
appleb_m2026-04-20 12:05:41 +02:00
8f75b466b7
Models: added DAQOperation Enum and LoopCenteringResult dataclass. Corrected some whitespace formatting
appleb_m2026-04-20 11:47:14 +02:00
e8086b9a0e
DAQ: server.py moved LOGGING_CONFIG to logger_config.py, now imported via a function
appleb_m2026-04-20 09:47:48 +02:00
52c90abc70
DAQ: tidied up logging in server.py, added a filter to uvicron access so it does not log successful status access requests, this should be enabled if status debugging is needed, for example if status polling is causing lag.
appleb_m2026-04-20 09:46:53 +02:00
5f05d92e91
DAQ: removed unnessacery imports from server.py
appleb_m2026-04-20 09:45:00 +02:00
8cfb9718e0
GUI: added check to camera thread to handle encoded jpeg or not encoded streams
appleb_m2026-04-20 09:30:57 +02:00
51d8d8aadf
DAQ: bec_worker, now use bec states
appleb_m2026-04-17 17:27:15 +02:00
e5194107d0
DAQ: the mlbox prediction bug fixes and updates, now uses target from aarelc_infer.py
appleb_m2026-04-17 17:27:04 +02:00
f4b5d420cf
DAQ: the big mlbox upgrade
appleb_m2026-04-17 10:59:56 +02:00
b4c14fe950
GUI: fixed camera image bug
appleb_m2026-04-16 11:50:41 +02:00
74c3a9f4ba
DAQ: possible TODOS for daq.py
appleb_m2026-04-15 17:05:37 +02:00
347aea4cb0
DAQ: possible for this filter to affect self.sample_Spreadsheet otuside of funciton, atttempted to fix. needs testing
appleb_m2026-04-15 17:02:21 +02:00
c08377a308
DAQ: bug fixe in face_detection_centre_correction and removed superfluos code in fasce detection sequence
appleb_m2026-04-15 17:01:55 +02:00
4069caa77a
DAQ: bug fixes in setup data collection where it wanted RasterGridRequest or RasterGridRerqust, needed Rotation also
appleb_m2026-04-15 17:01:28 +02:00
16ac939868
DAQ: bug fixes in auto_center - may need rewriting
appleb_m2026-04-15 17:01:02 +02:00
689c4c5474
DAQ: fix bug where execute mount may not throw an error
appleb_m2026-04-15 17:00:45 +02:00
49e2788580
DAQ: bug fixes to __raster
appleb_m2026-04-15 17:00:26 +02:00
72fa8e11ef
DAQ: bug fixes/tidy up of exception calls
appleb_m2026-04-15 16:25:17 +02:00
5c207ed5de
DAQ: After 1D scan, X and Y movement were swapped
leonarski_f2026-04-08 10:43:51 +02:00
9692dab6f7
DAQ: When moving at the end of raster scan nudge was calculated twice
leonarski_f2026-04-08 10:25:46 +02:00
7ae95acd1f
DAQ: Fix magnet position sensor PVs and simplify logic of the check
leonarski_f2026-04-08 08:32:51 +02:00
361b3912b9
DAQ: TELL no longer has motion enable check
leonarski_f2026-04-08 08:31:51 +02:00
6314322352
DAQ: starting to debug magnet sensor pvs and state check
appleb_m2026-04-02 16:20:31 +02:00
9758f7c800
Smargon, added in self.__pos and __pos_aero for simualted mode. Fixed intiializing script.
appleb_m2026-04-02 15:40:34 +02:00
appleb_m
duan_j
leonarski_f