Commit Graph
729 Commits
Author SHA1 Message Date
appleb_m 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. 2026-02-19 17:11:51 +01:00
appleb_m 8a996df1b1 TELL/PShell: removed local pshell client, now use python package import, addded requirement to pyproject.toml 2026-02-19 17:10:06 +01:00
appleb_m 007733532a DAQ/COMMON: update imports of aaredb 2026-02-19 16:44:16 +01:00
appleb_m a0530d5261 bec_worker: further work to modifiy bec_worker.py 2026-02-19 16:42:14 +01:00
appleb_m bed83f63ef mx_lib: tidied up wait functions and removed redundant code. 2026-02-19 16:41:52 +01:00
appleb_m 942a2a1726 BEC_Worker - WIP 2026-02-19 13:48:38 +01:00
appleb_m 6b174d0d8d updated dependencies 2026-02-18 10:57:06 +01:00
appleb_m b19b8d37b2 pshell_client: added some further ifnoramtion for auto docs 2026-02-18 10:56:39 +01:00
appleb_m 4f84eb67f2 Devices: added det_cov, coll_z, scin_z, beamstop_x,y,z and cryojet_x, and fixed PV name bugs 2026-02-18 10:56:07 +01:00
appleb_m 4e880acb8c DAQ: tidy up my_motor.p 2026-02-18 10:55:14 +01:00
appleb_m 52545825b9 Further tests for autoexposure. 2026-02-06 15:59:47 +01:00
appleb_m 94ebfd7001 DAQ: smargon, added aerotech functionality 2026-02-06 15:59:27 +01:00
appleb_m 6b47ceec5b DAQ: refactord enum pv and setgetpv, added prederfined PV 2026-02-06 15:59:11 +01:00
appleb_m 7fb1c61677 DAQ: tempoary raster function for SAS-TT school demo 2026-02-06 15:58:29 +01:00
appleb_m e1866c0085 Common: added aerotech coordinate model for using smargon to interface aerotech 2026-02-06 15:58:00 +01:00
appleb_m 1fd9988a2f BEC: further testing, added import for the ipython client, haven't tested yet 2026-02-06 15:57:29 +01:00
appleb_m 817f244d62 Added a script to test autofocus, WIP 2026-02-06 15:56:53 +01:00
appleb_m ead99f0457 Added further fucntionality to the automation 1 python api wrapper 2026-02-06 15:56:41 +01:00
appleb_m ab6ecff677 Added test script for sam cam auto exposure 2026-01-30 17:04:45 +01:00
appleb_m e6d84a307d Workflows - temporarily added back sa2se and common2rse methods. 2026-01-29 16:49:48 +01:00
appleb_m 1058290099 logger_config.py: added back in config yaml loading otherwise logging statements are silenced. 2026-01-29 16:49:21 +01:00
appleb_m ddec076fcf DAQ: updates to enum_pc and set_get_pv classes, WIP 2026-01-29 16:48:56 +01:00
appleb_m 4aeee4bf95 Aerotech: added functionality to epics controller and to python api. 2026-01-29 16:48:13 +01:00
appleb_m f9970a66cb DAQ: removed samcam script as it duplicated area_detector 2026-01-29 16:46:54 +01:00
appleb_m 871384d45d CONFIG: update aerotech home position for X10SA 2026-01-29 16:46:11 +01:00
appleb_m 6bacf63117 DAQ: functionality for auto_exposure added using enums 2026-01-29 16:45:48 +01:00
appleb_m 6db8387dc9 DAQ: added back PVs for beamstop, scintilator, collimator, front and back light and cryojet position. PV handling may change. 2026-01-29 16:45:19 +01:00
appleb_m 774f86765c BEC: added in additooanl functionality and a potential way to do states mimicking workflows - would move to workflows.py 2026-01-29 16:44:30 +01:00
appleb_m a9a6f71005 DAQ: attempt at camera auto exposure, however there are issues when the backlight is not in. The front light may not be bright enough or set values may need to be used 2026-01-29 16:43:55 +01:00
appleb_m 4a552c0dcd Sample Camera - added PVs to get expo and gain readbacks, implemented a set_auto_once button 2026-01-29 14:32:16 +01:00
appleb_m 6d6678f78a GUI: fixed bug where saved_button was connected to goto_button_pressed instead and goto_button was not connected. 2026-01-29 14:31:32 +01:00
appleb_m c6f22836b2 GUI: added cameras for X10SA, set to change in main_window from default values in gui.py 2026-01-29 13:52:38 +01:00
appleb_m 71de06b3d1 Tell: added Tell client for X10SA, corrected print statements and added check for removed status. 2026-01-29 13:51:56 +01:00
appleb_m 808c25eecb DAQ: updates to spreadhseet and tell updater to use beamline enum/value 2026-01-23 10:18:10 +01:00
appleb_m ab54899d9c DAQ: updates to spreadhseet and tell updater 2026-01-22 12:29:58 +01:00
appleb_m e9ff5294cc DAQ: updates to spreadhseet and tell updater 2026-01-22 12:28:02 +01:00
appleb_m aab3eb2cfe DAQ: updates to spreadhseet and tell updater 2026-01-22 12:21:10 +01:00
appleb_m 4fd81855a5 DAQ: updates to spreadhseet and tell updater 2026-01-22 11:50:23 +01:00
appleb_m 029c5eb1ee DAQ: sam cam class WIP 2026-01-22 11:42:10 +01:00
appleb_m 7f1c495d40 DAQ: updates to tellupdater and spreadsheetupdater from master branch. 2026-01-22 11:25:54 +01:00
appleb_m a8ccc88636 DAQ: change samcam settings when zoom is changed (may need a seperate function?) 2026-01-22 10:14:56 +01:00
appleb_m d05a60d495 Devices: non_standard rewrite, WIP 2026-01-22 10:13:54 +01:00
appleb_m db6b95a9e4 My_motor: changed speed to get and put VELO rbv as Motor.slew_speed was not working 2026-01-22 10:13:32 +01:00
appleb_m 7dc103e238 Devices: added samcam_auto function to switch between EPICs SAMCAM inbuilt auto exposure and manual exposure. Auto exposure is not good at low zooms 2026-01-22 10:12:29 +01:00
appleb_m f0fc348949 aera_det: added set_manual in case set_atuo is used. 2026-01-22 10:11:19 +01:00
appleb_m a49176aa13 DAQ: added functionality to set global variables for aerotech controller in epics 2026-01-22 10:10:42 +01:00
appleb_m c5f5198d8d Merge remote-tracking branch 'origin/x10sa' into x10sa 2026-01-16 17:26:14 +01:00
appleb_m a3267413cb DAQ: added bec class 2026-01-16 17:25:33 +01:00
leonarski_f 8ef96c9ca7 DAQ: Doesn't work and don't know why 2026-01-16 17:24:00 +01:00
leonarski_f 8c45eb7be9 GUI: Autofocus - work in progress 2026-01-16 17:14:54 +01:00