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

Commit Graph

  • 6fb579ead3 Updated pyproject.toml aaredb dependency to version 0.1.2a5 appleb_m 2026-06-12 14:57:56 +02:00
  • 1e851955d7 devices: added ring current, removed iold epics variables, added notes to self appleb_m 2026-06-12 13:58:08 +02:00
  • 5b73c07993 devices: added fastshutter appleb_m 2026-06-12 13:57:30 +02:00
  • 1ba656a18c devices: added trasnmission appleb_m 2026-06-12 13:57:11 +02:00
  • a44f865812 devices: removed further unused epics variables appleb_m 2026-06-12 13:56:23 +02:00
  • 6daf0a24f6 comments regarding front and back light appleb_m 2026-06-12 13:55:45 +02:00
  • ac1ad2cf2d anneal functionality added, including wait time, SHould be tested/optimised later. appleb_m 2026-06-12 13:55:27 +02:00
  • 8a682a6b97 exp_hutch_shutter added back in (import) appleb_m 2026-06-12 13:55:02 +02:00
  • 27025eb91d exp_hutch_shutter added back in appleb_m 2026-06-12 13:54:49 +02:00
  • 49fb0be507 added option to save dtz safe position in redis but currently unused, added detector limit modifier so we do not hit soft limits by mistak in yaml file. Moved Detector_Z low and high limit check to the device and out of workflows. appleb_m 2026-06-12 13:53:54 +02:00
  • 72d826dbda bec_worker: removed superfluous devices and added frontlight brightness appleb_m 2026-06-12 13:51:13 +02:00
  • 9fc81ff3bf auth: corrected supre_user accounts list appleb_m 2026-06-12 13:50:47 +02:00
  • 8cba001a8b removed unused devices, assocaited tests and old sam cam test file appleb_m 2026-06-12 13:50:31 +02:00
  • 0e4ea638d2 removed with_retry appleb_m 2026-06-12 09:41:28 +02:00
  • 166a9e10ee Kerberos running appleb_m 2026-06-11 16:45:41 +02:00
  • 04be8e1922 tokens WIP appleb_m 2026-06-11 16:44:21 +02:00
  • 54c8c33995 simplify Kerberos authentication by removing JSON parsing and token validation steps apache-auth duan_j 2026-06-11 16:19:36 +02:00
  • e97b36f09e Merge branch 'apache-auth' into operation_standardisation appleb_m 2026-06-11 16:15:54 +02:00
  • 940268222f updated safe psotions for 6D not 10S. please fix me appleb_m 2026-06-11 16:14:54 +02:00
  • a88423d413 prediction_subscriber.py: removed message logging appleb_m 2026-06-11 16:14:38 +02:00
  • a18735824c devices: ring current (pv to bec) and ernergy (hard code) appleb_m 2026-06-11 16:14:27 +02:00
  • 4af96a194d bec_worker: removed bs_z set in move to appleb_m 2026-06-11 16:12:20 +02:00
  • dba95b07f1 aerotech: logging appleb_m 2026-06-11 16:11:28 +02:00
  • c6698dca06 remove Apache access log-based authentication and simplify Kerberos proxy handling duan_j 2026-06-11 15:55:10 +02:00
  • e95eff9751 tests: refactord tests based on changes to auth and sample info appleb_m 2026-06-10 15:19:53 +02:00
  • 40f2835aca Merge branch 'apache-auth' appleb_m 2026-06-10 15:07:13 +02:00
  • 2a3b09e719 banner: added banner for spalsh screen appleb_m 2026-06-10 15:06:56 +02:00
  • 22b8f15fd5 gui: updated autoamtion view and added mode switrching buttons appleb_m 2026-06-10 15:06:45 +02:00
  • a5683c9728 gui: made certPath command line option unique appleb_m 2026-06-10 14:50:32 +02:00
  • 01a656d956 auth: added additioanl exception tracking, updated x10sa yaml appleb_m 2026-06-10 13:27:10 +02:00
  • 860cedfa1a GUI: added raster rotation and screening counts to GUI tell panel adn reference tools panel appleb_m 2026-06-10 13:17:59 +02:00
  • 076c796b4d tests: updated tests for new authentication protocols and for new sample short info appleb_m 2026-06-10 13:17:28 +02:00
  • c3bc745210 add support for configurable certificate paths per beamline in GUI duan_j 2026-06-10 14:24:08 +02:00
  • 0c0ebe2ff1 use cacert path from function parameters duan_j 2026-06-10 14:23:44 +02:00
  • a0dee43a37 load cacert path from funtion parameters duan_j 2026-06-10 14:23:28 +02:00
  • 0212f5c29e remove hard coded CACERT path duan_j 2026-06-10 14:23:03 +02:00
  • 5e00773160 pass cert_path for each beamline yaml duan_j 2026-06-10 14:09:22 +02:00
  • 7613fec52c auth: printing base_url for debugging appleb_m 2026-06-10 11:40:43 +02:00
  • 1919c25874 error handling in daq appleb_m 2026-06-10 11:40:30 +02:00
  • c913db87e5 error handling in rotation appleb_m 2026-06-10 11:40:05 +02:00
  • 37ef7e8381 handle SSL errors for self-signed certificates in SSEClient and DAQWorker duan_j 2026-06-10 11:28:07 +02:00
  • 78cb160377 make sure GUI checks the certificate for HTTPS requests duan_j 2026-06-10 11:26:04 +02:00
  • fa148c13d8 adding screening_count, raster_count, and rotation_count to spreadsheetupdater model GotthardG 2026-06-10 11:00:28 +02:00
  • 7b60d67ebe disable proxy headers in uvicorn configuration duan_j 2026-06-10 10:35:36 +02:00
  • 7c19d80e20 add logging for client host validation in authentication module duan_j 2026-06-10 10:27:37 +02:00
  • 4c0c86b8ec validate proxy header authentication by checking loopback addresses duan_j 2026-06-10 10:24:28 +02:00
  • 11a56addee migrate DAQ URLs to HTTPS and simplify Kerberos SPNEGO token authentication duan_j 2026-06-10 10:18:31 +02:00
  • f031e011ae Merge remote-tracking branch 'origin/apache-auth' into apache-auth appleb_m 2026-06-09 16:31:56 +02:00
  • c633891c4a add Apache authentication and token handling using curl in GUI and access log parsing in DAQ duan_j 2026-06-09 16:16:11 +02:00
  • fca7c588c5 remove dependency on gssapi directly using curl to negotiate with https from GUI duan_j 2026-06-09 15:45:33 +02:00
  • 96d9e602e4 remove dependency on gssapi duan_j 2026-06-09 15:44:42 +02:00
  • f0ecba9a8a add Kerberos authentication support with proxy headers duan_j 2026-06-02 16:24:42 +02:00
  • 060a9dfa62 bec_worker: no longer using initialise_sample_environment_devices appleb_m 2026-06-09 16:30:17 +02:00
  • 6351265698 add Apache authentication and token handling using curl in GUI and access log parsing in DAQ duan_j 2026-06-09 16:16:11 +02:00
  • 8dc1ecacb2 remove dependency on gssapi directly using curl to negotiate with https from GUI duan_j 2026-06-09 15:45:33 +02:00
  • 6bed4102e7 remove dependency on gssapi duan_j 2026-06-09 15:44:42 +02:00
  • 6234b6231f Merge remote-tracking branch 'origin/apache-auth' into apache-auth appleb_m 2026-06-09 14:33:27 +02:00
  • 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