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

Commit Graph

  • 808c25eecb DAQ: updates to spreadhseet and tell updater to use beamline enum/value appleb_m 2026-01-23 10:18:10 +01:00
  • ab54899d9c DAQ: updates to spreadhseet and tell updater appleb_m 2026-01-22 12:29:58 +01:00
  • e9ff5294cc DAQ: updates to spreadhseet and tell updater appleb_m 2026-01-22 12:28:02 +01:00
  • aab3eb2cfe DAQ: updates to spreadhseet and tell updater appleb_m 2026-01-22 12:21:10 +01:00
  • 4fd81855a5 DAQ: updates to spreadhseet and tell updater appleb_m 2026-01-22 11:50:23 +01:00
  • 029c5eb1ee DAQ: sam cam class WIP appleb_m 2026-01-22 11:42:10 +01:00
  • 7f1c495d40 DAQ: updates to tellupdater and spreadsheetupdater from master branch. appleb_m 2026-01-22 11:25:54 +01:00
  • 8a7a4d7fc1 DAQ: tellupdater script and spreadsheetupdater updated for X10SA GotthardG 2026-01-22 10:19:07 +01:00
  • a8ccc88636 DAQ: change samcam settings when zoom is changed (may need a seperate function?) appleb_m 2026-01-22 10:14:56 +01:00
  • d05a60d495 Devices: non_standard rewrite, WIP appleb_m 2026-01-22 10:13:54 +01:00
  • db6b95a9e4 My_motor: changed speed to get and put VELO rbv as Motor.slew_speed was not working appleb_m 2026-01-22 10:13:32 +01:00
  • 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 appleb_m 2026-01-22 10:12:29 +01:00
  • f0fc348949 aera_det: added set_manual in case set_atuo is used. appleb_m 2026-01-22 10:11:19 +01:00
  • a49176aa13 DAQ: added functionality to set global variables for aerotech controller in epics appleb_m 2026-01-22 10:10:42 +01:00
  • c5f5198d8d Merge remote-tracking branch 'origin/x10sa' into x10sa appleb_m 2026-01-16 17:26:14 +01:00
  • a3267413cb DAQ: added bec class appleb_m 2026-01-16 17:25:33 +01:00
  • 8ef96c9ca7 DAQ: Doesn't work and don't know why leonarski_f 2026-01-16 17:24:00 +01:00
  • 8c45eb7be9 GUI: Autofocus - work in progress leonarski_f 2026-01-16 17:14:54 +01:00
  • 9479c95106 GUI: Camera thread improvements leonarski_f 2026-01-16 16:14:51 +01:00
  • 5bb5186d48 DAQ: Fix Aerotech position calculation leonarski_f 2026-01-16 16:00:08 +01:00
  • 65dd1a6856 DAQ: Bring back Aerotech reference position leonarski_f 2026-01-16 13:16:24 +01:00
  • bcbb53dd1c DAQ: Set default camera translation factor B to 512 leonarski_f 2026-01-16 13:15:26 +01:00
  • 0b44112eb4 GUI: Add sharpness leonarski_f 2026-01-16 12:49:23 +01:00
  • 5a7f09a619 DAQ/GUI: Add front/back light leonarski_f 2026-01-16 12:05:47 +01:00
  • 8ecf176cdf DAQ: Small fix to handling zero detector distance in resolution calculation leonarski_f 2026-01-16 10:09:13 +01:00
  • 140eb6fe2a DAQ: Remove change of camera settings on zoom leonarski_f 2026-01-16 10:03:44 +01:00
  • 9adbff0006 GUI: Fix camera color scheme leonarski_f 2026-01-15 16:57:46 +01:00
  • f783a887ed GUI: Handle authentication failure leonarski_f 2026-01-15 16:57:24 +01:00
  • e607f872a6 DAQ: added functionality to move aerotech x y and z to a coordinate. And to update the offset in aerotech. appleb_m 2026-01-16 13:55:29 +01:00
  • dc8d7799b1 DAQ: re added enum_pv and hopefully fixed front and back light settings appleb_m 2026-01-16 11:52:54 +01:00
  • 199f8dc57c DAQ: added back_light and fornt_light functionality for changing brightness, can set the state of the backlight. appleb_m 2026-01-16 10:29:26 +01:00
  • 0279b91327 DAQ: Fix typo set_omega -> set_aerotech_omega appleb_m 2026-01-16 09:53:03 +01:00
  • 393801952e DAQ: aerotech - cleaned up imports appleb_m 2026-01-16 09:45:33 +01:00
  • 5781184c28 DAQ: devices - added zoom get and set methods appleb_m 2026-01-16 09:44:36 +01:00
  • 39fd1b049a DAQ: devices - added zoom get and set methods appleb_m 2026-01-16 09:43:00 +01:00
  • fa8d63ba03 DAQ: rewrite of my_motor class to wrap furtehr functionality of the epics class appleb_m 2026-01-15 17:09:55 +01:00
  • 8a25ae2568 DAQ: rewrite of EnumPv appleb_m 2026-01-15 17:09:25 +01:00
  • 7362569006 DAQ: devices added functionality for aerotech omega and zoom control appleb_m 2026-01-15 17:09:16 +01:00
  • f96e34864b DAQ: update aerotech to not use Enum or EnumPv for debugging purposes appleb_m 2026-01-15 17:09:00 +01:00
  • 6c633a7887 DAQ: Barebones aerotech for X10SA appleb_m 2026-01-15 16:35:41 +01:00
  • 65c341077a GUI: Clean-up leonarski_f 2026-01-15 16:07:53 +01:00
  • b63ce6892f Remove fluorescence code leonarski_f 2026-01-15 15:36:45 +01:00
  • 11b5563131 Restructure leonarski_f 2026-01-15 15:34:53 +01:00
  • 2109673d4d Restructure leonarski_f 2026-01-15 15:28:07 +01:00
  • 0044b782ae Restructure leonarski_f 2026-01-15 15:21:32 +01:00
  • b506542b01 Change directory/package structure leonarski_f 2026-01-15 14:04:40 +01:00
  • d580da1e8c Rename mxlibs3/ to aaredevices/ leonarski_f 2026-01-15 14:00:15 +01:00
  • 4a409b5566 Remove scripts leonarski_f 2026-01-15 13:47:02 +01:00
  • 0f60f06964 Merge code leonarski_f 2026-01-15 13:46:19 +01:00
  • 0bd867b5fe DAQ/GUI: Remove ultralytics bindings leonarski_f 2026-01-15 13:03:31 +01:00
  • 18014e2d7c DAQ/GUI: Add relative omega movement - to be tested leonarski_f 2026-01-15 12:57:36 +01:00
  • e62cd5277e GUI: Add pserv address for X10SA camera leonarski_f 2026-01-14 16:07:01 +01:00
  • 8bad7a8308 update to conf.py to resovle import errors appleb_m 2026-01-05 16:42:25 +01:00
  • 556c1f734c update to conf.py to resovle import errors appleb_m 2026-01-05 16:21:27 +01:00
  • e7e8c2c8a1 update to conf.py to resovle import errors appleb_m 2026-01-05 16:15:08 +01:00
  • 46074a635d update to conf.py for autodeployment of docs appleb_m 2026-01-05 16:10:00 +01:00
  • 247d50141b added # to markdown files, changed index filepath in docs for autodeployment appleb_m 2026-01-05 16:01:16 +01:00
  • dab31ab6bb change location of gitpages deploy in workflows appleb_m 2026-01-05 13:35:37 +01:00
  • 42b9514a12 moved docs to daq, updated workflow appleb_m 2026-01-05 13:31:03 +01:00
  • 19b4373377 Update .gitea/workflows/action.yaml appleb_m 2026-01-05 13:22:58 +01:00
  • 4f0f261e96 added docs for autodeploy, renamed changelog to CHANGELOG for consistency appleb_m 2026-01-05 13:15:43 +01:00
  • 6eb9e8b8ea added docs and moved changelog.md appleb_m 2026-01-05 13:06:17 +01:00
  • 2ec961cac8 Skip-exisitng not allowed, now uplaod package when comit includes build and publish appleb_m 2026-01-05 13:03:43 +01:00
  • a23c676a4d Add --skip-exisiting to workflow to prevent conflicts appleb_m 2026-01-05 13:01:02 +01:00
  • 5098b03bf8 update action.yaml branches to master not main appleb_m 2026-01-05 12:55:46 +01:00
  • ac4d064dcf Update .gitea/workflows/action.yaml appleb_m 2026-01-05 12:53:21 +01:00
  • ff652ec5ed Update VERSION to 0.2.69 0.2.69 appleb_m 2025-12-22 13:54:53 +01:00
  • 3c81d02814 Tell: logger.debug stateements to see waht wait_ready does. Seems to not work. keeping for now until we fix. appleb_m 2025-12-22 13:53:03 +01:00
  • 10d378f0d1 Tell: logger.debug stateements to see waht wait_ready does. Seems to not work. keeping for now until we fix. appleb_m 2025-12-22 09:42:47 +01:00
  • 51e309a2aa GUI: check beamline state when you start data collection in raster appleb_m 2025-12-22 09:41:07 +01:00
  • 1fa421c5cf DAQ: added has_sufficient_low_res_spots function but forgot to commit it - sorry! appleb_m 2025-12-22 09:40:15 +01:00
  • 0796572cb8 DAQ: bug where find_xtal was using spot_count not low_res_spots for the initial check. appleb_m 2025-12-22 09:39:48 +01:00
  • bbc409eb81 GUI: upped status polling to 500ms due to potential network issues. appleb_m 2025-12-22 09:39:13 +01:00
  • 735ec7514b DAQ: removed superfluos comment appleb_m 2025-12-22 09:38:28 +01:00
  • c40fa4f56a DAQ: added logic for axcfailed statement appleb_m 2025-12-22 09:38:15 +01:00
  • bca98172a9 DAQ: added try except to ingest statements so if they fail data is still displayed in the GUI. appleb_m 2025-12-22 09:37:23 +01:00
  • 300e719167 DAQ: moved wait_ready() earlier to see if this resolves a robot timing issue with the gripper. The different wait comamnds ahve simialr logic but seem to break. Needs exploring in the new year. appleb_m 2025-12-22 09:35:24 +01:00
  • 92428ff2fa DAQ: bug where has_sufficient_low_res_spots was not imported. appleb_m 2025-12-22 09:34:24 +01:00
  • 7a9411d0cd DAQ: added class variable for the min low spots threshold appleb_m 2025-12-22 09:33:46 +01:00
  • 2a54ee43d3 DAQ: added error handling for raster if spots less than a thresh-hold. Currently commented as it affects manual users, should only be used in automation. appleb_m 2025-12-22 09:33:26 +01:00
  • 7acba275ba DAQ: updated mount failure logic and error handling. appleb_m 2025-12-22 09:31:33 +01:00
  • 82ba3a4412 DAQ: added AXCFailed exception class. This needs tidyign up in Jan appleb_m 2025-12-22 09:30:49 +01:00
  • 90545a420b DAQ: robot dry and park on repeated mount failures appleb_m 2025-12-22 09:30:27 +01:00
  • 7bf97eeae3 GUI: Check beamline state before running automation. appleb_m 2025-12-18 16:34:19 +01:00
  • 29b1ee85bd GUI: Make more consistent interface to load image after rotation scan leonarski_f 2025-12-16 09:36:59 +01:00
  • 2bd3c9d242 Merge remote-tracking branch 'origin/master' 0.2.68 appleb_m 2025-12-12 14:43:08 +01:00
  • 2bb9b3dd29 Update version to 0.2.68 appleb_m 2025-12-12 14:42:33 +01:00
  • 91f1ea49e9 Update changelog.md appleb_m 2025-12-12 14:40:14 +01:00
  • 9827acf95a Update changelog.md appleb_m 2025-12-12 14:39:39 +01:00
  • ee74cdc92a DAQ: added ingest scan to rotation and screening. And fucntionality in aaredb TellSampleHandling appleb_m 2025-12-12 14:35:58 +01:00
  • 9f85c07965 models: bug where sample_id and attach_image where twice follwoign rework appleb_m 2025-12-12 14:35:10 +01:00
  • e7f394a833 GUI: dtz protection for high_res in smart_panel appleb_m 2025-12-12 14:34:40 +01:00
  • 593854282f GUI: added an additional fudge factor to the smart_calc so that it extends further for high_res, but ahs miniaml effect on low. appleb_m 2025-12-12 14:34:06 +01:00
  • 24f26a5d40 Models: rearranged the order in ScanResultPayloadModel to be consistent elsewhere. appleb_m 2025-12-12 14:29:32 +01:00
  • aa1f7b0a73 DAQ: added wait messages for robot to track strange behaviour appleb_m 2025-12-11 13:33:23 +01:00
  • 13cb35b2c6 GUI: fixed bug in automation where sample table wasnt updated when an error occured appleb_m 2025-12-11 13:33:03 +01:00
  • d53bb581eb GUI: changed msg in smaple_missing_dialogue-box appleb_m 2025-12-11 13:32:11 +01:00
  • 7744ad6f5a GUI: fixed error handling in daq_worker appleb_m 2025-12-11 13:31:51 +01:00
  • 6960e05815 DAQ: move_park isntead of dry. Need a park and dry fucnction appleb_m 2025-12-11 13:31:34 +01:00
  • eb66fd2f7f DAQ: don't wait for dry when failure, wait after dry when failure. Added error message to track this. appleb_m 2025-12-11 12:34:52 +01:00