Commit Graph
823 Commits
Author SHA1 Message Date
appleb_m ecf4ccffb3 daq_worker: added missing aerotech and tell changes to status respone handler 2026-03-24 11:12:43 +01:00
appleb_m ae52d411e5 jfjoch.py: added simulated mode. 2026-03-24 11:12:14 +01:00
appleb_m 130f275197 devices: added magnet position sensor functions and moved set_transmission function 2026-03-24 11:11:52 +01:00
appleb_m 9a0f7abba0 BIG AEROTECH UPGRADE: transferred to aerotech api. Ported several functions from Coordinate to aerotech coordinate. Nees thorough testing as this could lead to strange behaviour 2026-03-24 11:11:02 +01:00
appleb_m 5634554c00 GUI/DAQ: fixed connection error handling for tell, daq, smargon. Added handling for aerotech. Fixed bug where connection messaged flashed when polling status, fixed bug where tell connected would quash other messages and appear as an error. 2026-03-24 11:06:32 +01:00
appleb_m e9f3688952 Models: added aerotech connected and error to DAQStatusModel 2026-03-24 10:59:16 +01:00
appleb_m 3edf9200fd Tell: start of rework - needs testing 2026-03-24 09:41:22 +01:00
appleb_m 95010444fd DAQ: throttle userrightsexception. so it does not repeatedly log the same error 2026-03-24 09:31:16 +01:00
appleb_m eaa6f0cd0c DAQ: throttle userrightsexception. so it does not repeatedly log the same error 2026-03-24 09:31:09 +01:00
appleb_m ba559c5efa GUI: fixed tell error flashing - hopefully 2026-03-24 09:30:25 +01:00
appleb_m cacc986785 Workflows: use ABR_POS_MOUNT 2026-03-24 09:28:56 +01:00
appleb_m 322370ac08 ALC: remove background function and button 2026-03-24 09:28:11 +01:00
appleb_m c25e20a10c GUI: main window add restore default view and way to recover refernece samples panel, also capture default window state. 2026-03-20 16:57:32 +01:00
appleb_m 9db0e45f8b GUI: FD panel bug fix 2026-03-20 16:56:35 +01:00
appleb_m b44fd51610 DAQ: added park_and_dry functionality - needs testing 2026-03-13 09:43:06 +01:00
appleb_m 9caabeed89 Merge branch 'master' into x10sa-tutorial
Build and Publish / build (push) Failing after 12s
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-03-10 17:42:39 +01:00
appleb_m ab80110d05 Tutorials: update to texts, regesitering tutorial and actions 2026-03-10 17:41:29 +01:00
appleb_m 015dccc90d Tutorials: fixes to buttons, in particualr back action 2026-03-10 17:36:33 +01:00
appleb_m 52bf82d098 Tutorials second draft - added models, split functions across multiple scripts. WIP 2026-03-10 15:40:10 +01:00
appleb_m e962f48eb9 Revert changes to workflows before large merge from x10sa branch
Build and Publish / build (push) Failing after 11s
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-03-10 13:44:03 +01:00
appleb_m 67d682c39c Merge branch 'x10sa'
Build and Publish / build (push) Successful in 15s
# Conflicts:
#	common/pyproject.toml
#	daq/src/aaredaq/spreadsheetupdater.py
#	gui/pyproject.toml
#	pyproject.toml
#	src/aare/daq/tellupdater.py
2026-03-10 13:36:10 +01:00
appleb_m b3ca9dbc30 Update CHANGELOG.md 2026-03-10 13:27:36 +01:00
appleb_m ace06a21ea Tell: fix event names for mounting and added missing events for gripper detection and motion sync. WIP 2026-03-10 13:24:54 +01:00
appleb_m 425ab40b21 Daq: bug in mount 2026-03-10 13:23:15 +01:00
appleb_m a8acda20af GUI: fixed matplotlib bug in facedetectionpanel that was causing a non-fatal but unnecessary warning 2026-03-10 11:56:22 +01:00
appleb_m ee6b01005b DAQ/TELL - added check for motion_sync events 2026-03-10 11:56:00 +01:00
appleb_m 50b8dbf054 GUI/DAQ: added a sample resync to recovery, trying to limit amount we poll Tell for current sample psoiton - work in progress. 2026-03-10 11:55:46 +01:00
appleb_m cd04619814 DAQ: added authentication pathway for staff only, to seperate staff and active session check for beamline recovery operations 2026-03-10 11:53:27 +01:00
appleb_m d7fef70199 GUI: added an alert banner for major issues like tell and server dicsonnect/reconnect. 2026-03-10 11:04:11 +01:00
appleb_m 123485c133 GUI: error handling and messages if server, Tell or Smargon is disconnected 2026-03-10 10:43:20 +01:00
appleb_m 23f700c2f9 DAQ: db message limit omega to 2 decimal places 2026-03-10 10:42:51 +01:00
GotthardG 661db1315d Refactor SSE connection handling in tellupdater for simplicity and robustness 2026-03-10 10:15:23 +01:00
appleb_m 989624b319 AareDB: added comments/messages for upload_image method 2026-03-09 17:14:39 +01:00
appleb_m 6bda961231 Made some changes to authentication requests to give better message if server is down! 2026-03-09 17:14:18 +01:00
appleb_m dd537b3373 config: updated ABR_POS_HOME to be 0,0,0 this is defiend by aerotech hoem psoiton on aerotech controller. 2026-03-09 17:14:00 +01:00
appleb_m 4710ef155c Devices: added comment for current cryo positions 2026-03-09 17:13:22 +01:00
appleb_m 80154d9d11 DAQ: added screenshot to db from GUI, updates to face detection sequence, beamline recovery fucntions 2026-03-09 17:13:03 +01:00
appleb_m 095347cb9d samcam GUI: added screenshot butotn and controls 2026-03-09 17:12:23 +01:00
appleb_m 053bae75ba sam_cam: updated EPIC PV 2026-03-09 17:12:03 +01:00
appleb_m 8f0188a24e modelsL: added recovery action request class to take confirmation code for protected GUI controls 2026-03-09 17:11:36 +01:00
appleb_m bed396284f mx_lib: clean_filename function added. Maybe should be in common 2026-03-09 17:11:12 +01:00
appleb_m db913571f5 Sever and Daq worker: added new end poiints for the new panels and a screenshot button.Also added SSE for Face detection panel so it can update duering automation for comissioining purposes. 2026-03-09 17:10:56 +01:00
appleb_m c9b18d0be9 DAQ: updated smargon home pos 2026-03-09 17:09:45 +01:00
appleb_m b5612531ef GUI: updates to help messages, predictions stream, added polygons to predictions, added beamline recovery panel, controls help dialog, smargon trace panel 2026-03-09 17:09:33 +01:00
appleb_m 7e50f1070a DAQ: temporary updates to workflows.py 2026-03-09 17:07:38 +01:00
appleb_m 09e7200aee DAQ: safe beamline status 2026-02-27 16:48:24 +01:00
appleb_m 4a874326f0 Daq_worker: change error handling of smargon and tell. also chenged log handling 2026-02-27 16:47:48 +01:00
appleb_m a977d76791 Server: updated sample_geometry to use status.geom which should be more resilliant 2026-02-27 16:47:23 +01:00
appleb_m 44cb250f73 Changelog: updated version history 2026-02-27 16:28:50 +01:00
appleb_m 6e8a7af1f3 GUI: changed sdisplay_error to display_status - allows messages like disconnected and connected to be parsed to the user 2026-02-27 16:26:25 +01:00