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

Commit Graph

  • de0781053a add Kerberos authentication support with proxy headers duan_j 2026-06-02 16:24:42 +02:00
  • b8041c52a4 CONFIG: forgot to commit changes to config redis handling! appleb_m 2026-06-09 14:26:06 +02:00
  • bd8f66009c DAQ: finish refactor of exception handler, improve mount count fail handling and updated tests appleb_m 2026-06-09 14:25:37 +02:00
  • 675549c1c2 GUI: added automation_progress.py and updated comapct automation view appleb_m 2026-06-09 13:37:33 +02:00
  • 86ceebb120 tests: fixed errros with DataCollectionParameter assumptions in tests 0.3.2 appleb_m 2026-06-09 12:00:15 +02:00
  • 87c4f5b241 comapct automation panel updates appleb_m 2026-06-09 11:59:51 +02:00
  • 46d76a5e0e compact_automation: making a simplified view for autoamtion. appleb_m 2026-06-09 11:20:29 +02:00
  • 376375673b sample_short_info: added tracker for rotation, raster and screening count appleb_m 2026-06-09 11:18:31 +02:00
  • 0756578acd Merge remote-tracking branch 'origin/master' appleb_m 2026-06-09 11:17:12 +02:00
  • 0a47294244 gui_tests: removed irrelevant import/mocking that was causing tests to fail appleb_m 2026-06-09 11:16:09 +02:00
  • 07352f8d00 update to datacollection parameters model GotthardG 2026-06-08 20:57:28 +02:00
  • 4322720f8f gui:busy overlay fixes appleb_m 2026-06-09 09:53:16 +02:00
  • 3f06afa8e5 main_window - needed cfg_get for secondary camera - secondary camera should be in gui appleb_m 2026-06-09 09:53:00 +02:00
  • 7c3629529e xo6da: added secondary beamline camera. appleb_m 2026-06-09 09:52:30 +02:00
  • dcbd945053 busy_ovoerlay: added a busy_overlay widget so that both axis cameras and the sam cam source the same busy overlay settings appleb_m 2026-06-08 14:40:26 +02:00
  • 447767f7de camer_image - busy is now middle/botom of screen. To be adjusted further. Can udno this very easyily appleb_m 2026-06-08 13:42:10 +02:00
  • cbfb66949e axis_camera: added refeesh button and busy overlay. Made sperate widget/panel as "default" axis camera tab appleb_m 2026-06-08 13:40:27 +02:00
  • 73b49829da Merge remote-tracking branch 'origin/master' appleb_m 2026-06-08 11:47:58 +02:00
  • 8867cdc791 aaredb: fixed indentation for certificate paths appleb_m 2026-06-08 11:47:39 +02:00
  • b9f63a2a2e tellupdater.py spreadsheetupdater.py and aaredb.py to use dynamic beamline certificates based on the beamline name GotthardG 2026-06-08 11:30:18 +02:00
  • c55facbee1 Merge remote-tracking branch 'origin/master' appleb_m 2026-06-08 11:27:45 +02:00
  • 95b0fa0813 tellupdater.py spreadsheetupdater.py and aaredb.py to use dynamic beamline certificates based on the beamline name GotthardG 2026-06-08 11:24:19 +02:00
  • 3e91ca4d8f GUI: tidied up local contact panel appleb_m 2026-06-05 16:41:15 +02:00
  • a1c26177b4 Version 0.3.2: updated version number appleb_m 2026-06-05 14:11:08 +02:00
  • c3f16bcdf8 local_contact panel: added new tabs, connected back end tools such as reinitialising bec macros and devices, opening beamline specific web helpers, restarting backend connections tod evices such as jfjoch, tell, aerotech and smargon. appleb_m 2026-06-05 14:10:34 +02:00
  • d9c9f4db14 exception_handler: removed excessive logging meesages from with the exception classes so that they can be calle dlocally when needed instead of always appleb_m 2026-06-05 14:09:27 +02:00
  • 432f841632 pyproject.toml: updated dependencies of BEC, JFJoch_client and aaredb appleb_m 2026-06-05 14:08:35 +02:00
  • f2581f0684 EXCEPTION REFACTOR: Large scale exception refactor mdipoint, to be tested. If broken scale back this commit and fix tests 0.3.1 appleb_m 2026-06-03 16:43:42 +02:00
  • c6ee5560a0 EXCEPTION REFACTOR: Large scale exception refactor mdipoint, to be tested. If broken scale back this commit and fix tests appleb_m 2026-06-03 15:57:26 +02:00
  • 6e5e69f737 bec_workr: added sci logging and log statements for BEc alrm raising. appleb_m 2026-06-03 15:56:18 +02:00
  • 8ebd4cd962 cameraThread: bug whhere it would try to quti forever if already quit appleb_m 2026-06-03 15:54:03 +02:00
  • b8e31a749d tests: fixing broken tests after refactor appleb_m 2026-06-03 15:53:29 +02:00
  • 8097fd147f bec: debugging appleb_m 2026-06-03 09:41:50 +02:00
  • fec2bd6f8f config: abr test appleb_m 2026-06-03 09:41:38 +02:00
  • 67100144e1 add Kerberos authentication support with proxy headers duan_j 2026-06-02 16:24:42 +02:00
  • 73e9aebdfe gui: refactored icon and banner location to new folder. Added banner. Made sperate splash screen widget. appleb_m 2026-06-02 14:49:00 +02:00
  • 7a60e68a3f bec: accidentally committed a log at some point, has been removed appleb_m 2026-06-02 10:56:36 +02:00
  • e8c381dfa1 bec: converting epics devices in use to bec appleb_m 2026-06-02 10:55:08 +02:00
  • 7b2cdd3ae4 bec: converting epics devices in use to bec appleb_m 2026-06-02 10:55:04 +02:00
  • b9dfe6d751 jfjoch: now sending unit cell and space group if provided from spreadsheet appleb_m 2026-06-02 10:54:39 +02:00
  • 025bf26d9d workflows: refactored to use daq move_to fucntion wrapper of planner move to function appleb_m 2026-06-02 10:53:50 +02:00
  • 44f2a6d0b8 gui: added icon appleb_m 2026-06-02 10:52:14 +02:00
  • df60d51efb aarelc_infer.py: now using yaml for url and added urls to beamline config yamls appleb_m 2026-06-02 10:38:12 +02:00
  • d3912bff95 config.py: added note that areotech default is beamline specific appleb_m 2026-06-02 10:35:02 +02:00
  • 9a7db6ee26 aerotech.py: corrected default url for X06DA beamline appleb_m 2026-06-02 10:34:22 +02:00
  • bae400e9c3 diffraction_geometry.py: added a if __name__ == "__main__": block for testing appleb_m 2026-06-02 10:31:22 +02:00
  • 1bba68f2ed ml_box: enabled ml box for 6D beamline appleb_m 2026-06-02 10:28:44 +02:00
  • ce93d1502b scan_settings_panel.py: added a note to make min and max dtx in GUI and DAQ beamline dependnet and taken from yaml file appleb_m 2026-06-02 10:28:19 +02:00
  • f05ab28240 test: corrected test for aaredb to use db_id appleb_m 2026-06-02 10:27:34 +02:00
  • cfcabac6cf ytaml: converted to sls-gpu-003 for samcam and predicitions. Updated aerotech url for 6D appleb_m 2026-06-02 10:27:20 +02:00
  • 63a4058ccb tests: fixed operation tests after refactoring and added runtime state appleb_m 2026-06-02 10:26:42 +02:00
  • c971f70814 tell_client.py: added more explicit logging and a catch all error for wait_events, May remove this, appleb_m 2026-05-29 10:10:27 +02:00
  • 2715f4694e daq: add blower on command to every mount event appleb_m 2026-05-29 10:07:53 +02:00
  • 95e3ecbcea refactor of send_sample_event appleb_m 2026-05-29 10:07:40 +02:00
  • 792f72cb22 sam_cam: tempoarly removed auto white balance on daq start up, may be better to set to a specific value appleb_m 2026-05-29 10:06:49 +02:00
  • 401ec84df4 aaredb.py: refactored send_sample_event to use sample_id and not s appleb_m 2026-05-29 10:05:24 +02:00
  • a8b4bde605 workflows.py: tempoary protection for det_z on x10s, needs to be beamline specific and probably in the detector move call. appleb_m 2026-05-29 10:04:44 +02:00
  • 818f40bb4e update X10SA yaml, added detector_distance_minimum appleb_m 2026-05-29 10:04:07 +02:00
  • 2357e82935 DAQ: filenaming fix appleb_m 2026-05-27 11:43:21 +02:00
  • 1ffb60d0f9 GUI: prevented pasuing of queue if run check conditions weren't met, now put inside run. Needs testing appleb_m 2026-05-27 11:43:11 +02:00
  • 163836cb7f added time import to bec and workflows appleb_m 2026-05-22 18:07:24 +02:00
  • ba6c67abe5 error codesadded new aerrorcode and legacy comments appleb_m 2026-05-22 18:06:52 +02:00
  • cc7aa4dec7 jfjoch: cancel measurement on daq startuop appleb_m 2026-05-22 18:06:36 +02:00
  • db8460c51e gui: added checks to sample queue panel, should be centralised in the future appleb_m 2026-05-22 18:06:20 +02:00
  • 3801c11e8d exception hadnling updates appleb_m 2026-05-22 18:06:01 +02:00
  • 3654e126e6 tests: more tests appleb_m 2026-05-22 18:05:46 +02:00
  • 0097b246bf BEC: check_state and current_state methods appleb_m 2026-05-22 16:20:45 +02:00
  • 85cbc79e45 DAQ: starting exception_handler.py rework appleb_m 2026-05-22 16:19:59 +02:00
  • 59cb34fd89 yaml: added comment of future gpu-003 url appleb_m 2026-05-22 15:26:43 +02:00
  • 3e1a8e8042 mx_lib: fixed clean_filename appleb_m 2026-05-22 15:26:24 +02:00
  • d43418e003 DAQ: operations refactor. added providers, updated service creators appleb_m 2026-05-22 15:26:10 +02:00
  • 50fffd3bd4 bec_worker.py: added check_is_state and check_current_state appleb_m 2026-05-22 15:25:34 +02:00
  • 7f22786dc4 server: changes to park_and_Dry and tell_dry. appleb_m 2026-05-22 15:25:11 +02:00
  • 7b504d7f4a tests: updated LC and FD tests appleb_m 2026-05-22 15:24:57 +02:00
  • 4f0c37cc5f DAQ: updated Mounting operation scripts appleb_m 2026-05-22 15:24:45 +02:00
  • 6281eec8f2 DAQ: updated LC operation scripts appleb_m 2026-05-22 15:24:38 +02:00
  • 5f9c4c6083 DAQ: updated LC operation scripts appleb_m 2026-05-22 15:24:32 +02:00
  • 9b878055e7 DAQ: updated FD operation scripts appleb_m 2026-05-22 15:24:26 +02:00
  • b5124707ed DAQ: updated raster operation scripts appleb_m 2026-05-22 15:24:11 +02:00
  • e7201f7c0f DAQ: added common operation helpeers appleb_m 2026-05-22 15:23:45 +02:00
  • 7cbbf7942a DAQ: added screenshot service handler appleb_m 2026-05-22 15:23:32 +02:00
  • 362c8a2977 DAQ: added runtime protocols appleb_m 2026-05-22 15:23:03 +02:00
  • 9d973a0751 DAQ: added exception handling too beamline status to avoid suprressing errors. This should now catch any unhandlled error, while giving defaultts for aerotech, smargon and tell which will give a banner and erro state in the GUI appleb_m 2026-05-21 14:07:19 +02:00
  • f789a0e917 logging: defualt location changed back to ~/tmp/mxlogs/ as GUI also uses this path. The shared location leads to permissions errors. Needs a long term fix. appleb_m 2026-05-21 14:06:27 +02:00
  • 9ce13f8bf5 logging: defualt location changed back to ~/tmp/mxlogs/ as GUI also uses this path. The shared location leads to permissions errors. Needs a long term fix. appleb_m 2026-05-21 10:18:37 +02:00
  • 7b92686263 DAQ: MAJOR: Refactored mounting service appleb_m 2026-05-21 10:18:04 +02:00
  • 0b03c984bd DAQ: MAJOR: Refactored mounting service appleb_m 2026-05-20 16:11:44 +02:00
  • ff609bc68d DAQ: added end points for local contact panel, needs fixing appleb_m 2026-05-20 16:11:33 +02:00
  • b250e69fef DAQ: trying a different logging location appleb_m 2026-05-20 16:11:20 +02:00
  • 7847b5a98e DAQ/GUI: fixed local_contact_panel.py, exception handling for state transition errors, added transition to BEC maintenance mode, and wired or added palce holder functions for local contact panel appleb_m 2026-05-20 15:50:16 +02:00
  • f77faef534 tests: fixed tellupdater and workflows tests appleb_m 2026-05-20 15:15:02 +02:00
  • b744fce6de Merge remote-tracking branch 'origin/master' appleb_m 2026-05-20 13:55:45 +02:00
  • e86fbb3d9f DAQ: added loco panel and commands such as tell dry to GUI and DAQ Martin Appleby 2026-05-20 13:54:28 +02:00
  • 0d5f34c0c1 BEC: added better exception hadnling appleb_m 2026-05-20 11:49:58 +02:00
  • 6990d94a7f GUI: daq_worker surppress 403 errros and also adjust message when step failed. appleb_m 2026-05-20 11:49:46 +02:00
  • 78d8341a02 devices: timing auto exposure appleb_m 2026-05-20 11:49:21 +02:00
  • 0b40369f29 workflows: added detector moves. appleb_m 2026-05-20 11:49:07 +02:00
  • c7192909bb workflows: added set cam settings for xtal_snapshot - however if backlight fails this does not work. added detector moves. appleb_m 2026-05-20 11:48:59 +02:00
  • 8c92cf1c49 loop_centerL adjust default screenshot wait time appleb_m 2026-05-20 11:48:13 +02:00
  • 6857275a13 jfjoch: exception catching. appleb_m 2026-05-20 11:47:53 +02:00