mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 1 Actions Packages Projects Releases 77 Wiki Activity

Commit Graph

  • af4cd798d4 Daq_worker - updating error message text for users if devices disconnect appleb_m 2026-03-24 12:44:14 +01:00
  • 3b440cd1fa aerotech models appleb_m 2026-03-24 11:13:09 +01:00
  • ecf4ccffb3 daq_worker: added missing aerotech and tell changes to status respone handler appleb_m 2026-03-24 11:12:43 +01:00
  • ae52d411e5 jfjoch.py: added simulated mode. appleb_m 2026-03-24 11:12:14 +01:00
  • 130f275197 devices: added magnet position sensor functions and moved set_transmission function appleb_m 2026-03-24 11:11:52 +01:00
  • 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 appleb_m 2026-03-24 11:11:02 +01:00
  • 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. appleb_m 2026-03-24 11:06:32 +01:00
  • e9f3688952 Models: added aerotech connected and error to DAQStatusModel appleb_m 2026-03-24 10:59:16 +01:00
  • 3edf9200fd Tell: start of rework - needs testing appleb_m 2026-03-24 09:41:22 +01:00
  • 95010444fd DAQ: throttle userrightsexception. so it does not repeatedly log the same error appleb_m 2026-03-24 09:31:16 +01:00
  • eaa6f0cd0c DAQ: throttle userrightsexception. so it does not repeatedly log the same error appleb_m 2026-03-24 09:31:09 +01:00
  • ba559c5efa GUI: fixed tell error flashing - hopefully appleb_m 2026-03-24 09:30:25 +01:00
  • cacc986785 Workflows: use ABR_POS_MOUNT appleb_m 2026-03-24 09:28:56 +01:00
  • 322370ac08 ALC: remove background function and button appleb_m 2026-03-24 09:28:11 +01:00
  • c25e20a10c GUI: main window add restore default view and way to recover refernece samples panel, also capture default window state. appleb_m 2026-03-20 16:57:32 +01:00
  • 9db0e45f8b GUI: FD panel bug fix appleb_m 2026-03-20 16:56:35 +01:00
  • 12412c29d8 Improve SSE client resilience in tellupdater by adding retry mechanism and enhanced error logging GotthardG 2026-03-20 11:55:38 +01:00
  • b44fd51610 DAQ: added park_and_dry functionality - needs testing appleb_m 2026-03-13 09:43:06 +01:00
  • a3d4027b08 GUI: Use Pserv, spark and x10sa-queue appleb_m 2026-03-13 09:41:27 +01:00
  • 6110a24d61 Aerotech: think we are removing automation1 api, WIP appleb_m 2026-03-13 09:40:52 +01:00
  • 3c769106bf Aerotech: think we are removing automation1 api, WIP appleb_m 2026-03-13 09:40:44 +01:00
  • 6a7e61c1a7 SmargonTrace: change location of csv to /sls/mx/applications/logs appleb_m 2026-03-13 09:40:22 +01:00
  • 133a4a6876 TellUpdater: remove unessacery print statement appleb_m 2026-03-13 09:40:06 +01:00
  • 6d0cf1fc47 Tell Client: temp fix of bug appleb_m 2026-03-13 09:38:11 +01:00
  • 68df2930b3 Streamline SSE client setup in tellupdater by removing redundant HTTP stream handling GotthardG 2026-03-13 09:35:21 +01:00
  • 886bdcc032 Enhance SSE connection handling in tellupdater for compatibility and improved error handling GotthardG 2026-03-13 09:25:11 +01:00
  • 9caabeed89 Merge branch 'master' into x10sa-tutorial appleb_m 2026-03-10 17:42:39 +01:00
  • ab80110d05 Tutorials: update to texts, regesitering tutorial and actions appleb_m 2026-03-10 17:41:29 +01:00
  • 015dccc90d Tutorials: fixes to buttons, in particualr back action appleb_m 2026-03-10 17:36:33 +01:00
  • 52bf82d098 Tutorials second draft - added models, split functions across multiple scripts. WIP appleb_m 2026-03-10 15:40:10 +01:00
  • e962f48eb9 Revert changes to workflows before large merge from x10sa branch appleb_m 2026-03-10 13:44:03 +01:00
  • 67d682c39c Merge branch 'x10sa' appleb_m 2026-03-10 13:36:10 +01:00
  • b3ca9dbc30 Update CHANGELOG.md appleb_m 2026-03-10 13:27:36 +01:00
  • ace06a21ea Tell: fix event names for mounting and added missing events for gripper detection and motion sync. WIP appleb_m 2026-03-10 13:24:54 +01:00
  • 425ab40b21 Daq: bug in mount appleb_m 2026-03-10 13:23:15 +01:00
  • a8acda20af GUI: fixed matplotlib bug in facedetectionpanel that was causing a non-fatal but unnecessary warning appleb_m 2026-03-10 11:56:22 +01:00
  • ee6b01005b DAQ/TELL - added check for motion_sync events appleb_m 2026-03-10 11:56:00 +01:00
  • 50b8dbf054 GUI/DAQ: added a sample resync to recovery, trying to limit amount we poll Tell for current sample psoiton - work in progress. appleb_m 2026-03-10 11:55:46 +01:00
  • cd04619814 DAQ: added authentication pathway for staff only, to seperate staff and active session check for beamline recovery operations appleb_m 2026-03-10 11:53:27 +01:00
  • d7fef70199 GUI: added an alert banner for major issues like tell and server dicsonnect/reconnect. appleb_m 2026-03-10 11:04:11 +01:00
  • 123485c133 GUI: error handling and messages if server, Tell or Smargon is disconnected appleb_m 2026-03-10 10:43:20 +01:00
  • 23f700c2f9 DAQ: db message limit omega to 2 decimal places appleb_m 2026-03-10 10:42:51 +01:00
  • 661db1315d Refactor SSE connection handling in tellupdater for simplicity and robustness GotthardG 2026-03-10 10:15:23 +01:00
  • 989624b319 AareDB: added comments/messages for upload_image method appleb_m 2026-03-09 17:14:39 +01:00
  • 6bda961231 Made some changes to authentication requests to give better message if server is down! appleb_m 2026-03-09 17:14:18 +01:00
  • dd537b3373 config: updated ABR_POS_HOME to be 0,0,0 this is defiend by aerotech hoem psoiton on aerotech controller. appleb_m 2026-03-09 17:14:00 +01:00
  • 4710ef155c Devices: added comment for current cryo positions appleb_m 2026-03-09 17:13:22 +01:00
  • 80154d9d11 DAQ: added screenshot to db from GUI, updates to face detection sequence, beamline recovery fucntions appleb_m 2026-03-09 17:13:03 +01:00
  • 095347cb9d samcam GUI: added screenshot butotn and controls appleb_m 2026-03-09 17:12:23 +01:00
  • 053bae75ba sam_cam: updated EPIC PV appleb_m 2026-03-09 17:12:03 +01:00
  • 8f0188a24e modelsL: added recovery action request class to take confirmation code for protected GUI controls appleb_m 2026-03-09 17:11:36 +01:00
  • bed396284f mx_lib: clean_filename function added. Maybe should be in common appleb_m 2026-03-09 17:11:12 +01:00
  • 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. appleb_m 2026-03-09 17:10:56 +01:00
  • c9b18d0be9 DAQ: updated smargon home pos appleb_m 2026-03-09 17:09:45 +01:00
  • b5612531ef GUI: updates to help messages, predictions stream, added polygons to predictions, added beamline recovery panel, controls help dialog, smargon trace panel appleb_m 2026-03-09 17:09:33 +01:00
  • 7e50f1070a DAQ: temporary updates to workflows.py appleb_m 2026-03-09 17:07:38 +01:00
  • 09e7200aee DAQ: safe beamline status appleb_m 2026-02-27 16:48:24 +01:00
  • 4a874326f0 Daq_worker: change error handling of smargon and tell. also chenged log handling appleb_m 2026-02-27 16:47:48 +01:00
  • a977d76791 Server: updated sample_geometry to use status.geom which should be more resilliant appleb_m 2026-02-27 16:47:23 +01:00
  • 44cb250f73 Changelog: updated version history appleb_m 2026-02-27 16:28:50 +01:00
  • 6e8a7af1f3 GUI: changed sdisplay_error to display_status - allows messages like disconnected and connected to be parsed to the user appleb_m 2026-02-27 16:26:25 +01:00
  • 2fa0b2a6e6 DAQ/GUI: trying to make error handling in satatus pollign more robust. WIP appleb_m 2026-02-27 16:26:01 +01:00
  • 3fcd084b21 Dev_help: trying to add logs to deve_help panel and extend to different error codes appleb_m 2026-02-27 16:24:54 +01:00
  • c54d3c1f1e Exceptions: added handling for tellcommunication and smargon communication errors appleb_m 2026-02-27 16:24:21 +01:00
  • 02f2eead57 Smargon": better handling of smargon connection exceptions appleb_m 2026-02-27 16:23:53 +01:00
  • 0375b121ce TellClient: error handling and proxy if conenction fails on start up appleb_m 2026-02-27 16:23:32 +01:00
  • 2cbc049f2f GUI: corrected default zmq stream to use the ML box. appleb_m 2026-02-26 17:20:23 +01:00
  • b975b16b2b DAQ: further rework, WIP appleb_m 2026-02-26 17:20:02 +01:00
  • aec1cb3050 Exceptions: added developed help dialog to main window appleb_m 2026-02-26 17:19:27 +01:00
  • 8f59781107 Tutorials: added the option to build tutorials for the GUI. actual tutorials are a WIP. appleb_m 2026-02-26 17:19:08 +01:00
  • dee0405e2e Exceptions: further reworking how GUI and server handle exceptions, including developer dialog that allows you to search error codes in the GUI. appleb_m 2026-02-26 17:17:32 +01:00
  • 2dd3f0d9df init files added appleb_m 2026-02-26 16:54:09 +01:00
  • 6cf36faf30 Config: fix bug where active_session code be none therby throwing an error appleb_m 2026-02-24 15:30:59 +01:00
  • 8624ff31ef GUI: updates to camera thread appleb_m 2026-02-24 14:53:23 +01:00
  • 75234b4cc5 devices.py: added make_tell_client functionality and updated motor pvs appleb_m 2026-02-24 14:52:14 +01:00
  • bd2d6459b2 Logger_config - uncommented bits so that logger works as intended appleb_m 2026-02-24 14:51:22 +01:00
  • 48a14ac675 ml_box: added urls for multiple beamlines and added BoxClassEnum for model class types - WIP appleb_m 2026-02-24 14:50:55 +01:00
  • 18a463d2c3 MODELS: added 2x zoom settings to def_loop_centering_zoom so that ALC will do multiple zooms. appleb_m 2026-02-24 14:50:16 +01:00
  • b3a961095b mx_lib: force wait_float_condition to accept only float as value/target appleb_m 2026-02-24 14:49:40 +01:00
  • ce11e2bb55 GUI: Major rework to predict_subscriber, appleb_m 2026-02-24 14:49:12 +01:00
  • 0b18942d21 gui: ADDED check_enabled for developing appleb_m 2026-02-24 14:48:52 +01:00
  • 7e2577e025 TELL: typo in unmount message: check_command_ok appleb_m 2026-02-24 14:45:59 +01:00
  • 6769c02736 Server: update error handling appleb_m 2026-02-24 14:45:42 +01:00
  • d0a321b08c SpreadsheetUpdater - change aaredbclient import to aaredb appleb_m 2026-02-24 14:44:54 +01:00
  • 87cf325de1 TellUpdater: fixes to tell_updater appleb_m 2026-02-24 14:44:35 +01:00
  • 0b0b673fe8 DAQ: workflows - assert that scintillator is down where possivle, move aerotech to measure position after moving to sample alignment appleb_m 2026-02-24 14:44:20 +01:00
  • 1ed8554e5c GUI: message box, typo in debug message fixed appleb_m 2026-02-24 14:43:35 +01:00
  • 7b6c417597 Common: added error_codes script and refactored auth, excception handler and service_exception handler to utilise them appleb_m 2026-02-24 14:42:58 +01:00
  • 47d3b7934e Common: added verbose parameter to focus_measure_edges function so print statement doesnt pollute the GUI Log by default. appleb_m 2026-02-24 11:29:57 +01:00
  • 5444ee97e3 Updated exception hadnling in server to use fastAPI exception handlers, and moved custom exception classes to exception_handler.py in Common appleb_m 2026-02-24 11:28:25 +01:00
  • 5669536c55 GUI: updated prediction stream, added fps counter for the sample camera. appleb_m 2026-02-20 13:30:34 +01:00
  • ce7059ea63 GUI: added default prediction ZMQ for X10SA appleb_m 2026-02-19 17:12:47 +01:00
  • 9dffeec1e5 TELL: major refactor, removing redundant code, added a simulated tell client, updated docstrings and comments and converted wait functions to use inbuilt pshell functionality. appleb_m 2026-02-19 17:12:01 +01:00
  • c77ddad56b TELL: major refactor, removing redundant code, added a simulated tell client, updated docstrings and comments and converted wait functions to use inbuilt pshell functionality. appleb_m 2026-02-19 17:11:51 +01:00
  • 8a996df1b1 TELL/PShell: removed local pshell client, now use python package import, addded requirement to pyproject.toml appleb_m 2026-02-19 17:10:06 +01:00
  • 007733532a DAQ/COMMON: update imports of aaredb appleb_m 2026-02-19 16:44:16 +01:00
  • a0530d5261 bec_worker: further work to modifiy bec_worker.py appleb_m 2026-02-19 16:42:14 +01:00
  • bed83f63ef mx_lib: tidied up wait functions and removed redundant code. appleb_m 2026-02-19 16:41:52 +01:00
  • 942a2a1726 BEC_Worker - WIP appleb_m 2026-02-19 13:48:38 +01:00
  • 2e12df395f Incremented aaredaqlib version to 0.2.72, build and publish GotthardG 2026-02-18 21:02:22 +01:00