Commit Graph
43 Commits
Author SHA1 Message Date
leonarski_f 02b83b0096 DAQ: Now uploads screenshots to aaredb following loop centering and rotation data collection. Removed a zoom setting. Updated mount procedure to include loop centering following robot mount. 2025-07-04 16:23:29 +02:00
leonarski_f 731efccc2b DAQ: added ml_bounding_box to loop centering, creates grid scan grid using ml. Fixed bug where filename wouldn't iterate for copied grid scans. 2025-07-04 10:59:42 +02:00
leonarski_f 99305a473e DAQ: Added CryojetSettings as a seperate model in config and implemented in DAQ. 2025-07-03 14:15:05 +02:00
leonarski_f 606f1b62fb GUI: Add completed grid scan table 2025-06-29 12:19:47 +02:00
leonarski_f b1c4feaee2 VERSION: 0.2.3
Build and Publish / build (push) Successful in 21s
2025-06-26 13:48:21 +02:00
leonarski_f 27a00597ca VERSION: 0.2.2
Build and Publish / build (push) Successful in 21s
2025-06-26 13:45:57 +02:00
leonarski_f fd7a7adaab RELEASE: 0.2.1
Build and Publish / build (push) Successful in 21s
2025-06-26 13:32:36 +02:00
leonarski_f 1d9c8133c1 DAQ+GUI: Work in progress 2025-06-26 12:12:36 +02:00
leonarski_f 33b242eca6 DAQ: Add beam location 2025-06-25 12:32:45 +02:00
leonarski_f 77cf881c8c VERSION 0.2.0 2025-06-24 16:32:18 +02:00
leonarski_f 7e0a006668 GUI/DAQ: Integrate sample mounting logic and improve file path management
- Added `SampleMountLogic` for handling sample-related updates.
- Extended file path handling with additional macros (`{sample}`, `{sample_id}`, `{prefix}`).
- Updated `beam size` limits in GUI.
- Modified DAQ flux computation using BPM values.
- Enhanced `SampleShortInfo` model with `aaredb_params`.
2025-06-24 16:31:46 +02:00
leonarski_f e8961be15f Common: Upgrade jfjoch_client to 1.0.0rc51 2025-06-22 14:25:08 +02:00
leonarski_f 8271db82c2 DAQ/GUI: Improvements during the beamtime 2025-06-20 13:49:55 +02:00
leonarski_f 05a01f4efb DAQ: More work during the beamtime preparations
Build and Publish / build (push) Successful in 22s
2025-06-18 17:27:11 +02:00
leonarski_f 8c517d4bab DAQ: Modifications of June 18th 2025-06-18 13:27:00 +02:00
GotthardG 6cfef536e2 Added functions to create rotation and gridscans runs into aaredb.py
Build and Publish / build (push) Successful in 22s
2025-06-18 09:02:58 +02:00
leonarski_f 3c7ae33b80 GUI: Add beamline name to BeamlineStatus
Build and Publish / build (push) Successful in 23s
2025-06-17 16:22:36 +02:00
leonarski_f dafda5adcb GUI: Add detector description and serial number
Build and Publish / build (push) Successful in 22s
2025-06-17 16:16:54 +02:00
leonarski_f 136e85b2d7 Merge remote-tracking branch 'origin/tellupdater'
Build and Publish / build (push) Successful in 23s
# Conflicts:
#	common/pyproject.toml
2025-06-17 14:22:04 +02:00
GotthardG f369e5b555 Refactor TELL integration and update dependencies.
Build and Publish / build (pull_request) Successful in 22s
Replaced direct puck management logic with a WebSocket-based system for real-time updates from TELL. Introduced `tellupdater.py` to handle updates and improved AareDB client usage for cleaner API interactions. Updated `pyproject.toml` files to include dependency changes, ensuring compatibility with new TELL workflows.
2025-06-17 14:15:51 +02:00
leonarski_f 7c37297156 DAQ: Read pixel size from the detector
Build and Publish / build (push) Successful in 22s
2025-06-17 13:16:04 +02:00
leonarski_f 4e15624036 GUI: Move sample in Smargon Z with shift+click 2025-06-17 11:00:29 +02:00
leonarski_f a126f7ccb4 DAQ/GUI: Fixes during pre-beamtime test (2)
Build and Publish / build (push) Successful in 22s
2025-06-17 10:44:50 +02:00
GotthardG a780222d27 Refactor TELL integration and update dependencies.
Replaced direct puck management logic with a WebSocket-based system for real-time updates from TELL. Introduced `tellupdater.py` to handle updates and improved AareDB client usage for cleaner API interactions. Updated `pyproject.toml` files to include dependency changes, ensuring compatibility with new TELL workflows.
2025-06-17 10:21:00 +02:00
leonarski_f 451bd9f772 Models: Use jfjoch client result structure (WIP)
Build and Publish / build (push) Successful in 21s
2025-06-16 08:37:52 +02:00
leonarski_f 49a9f35e55 GUI: Minor improvements to grid scan result display
Build and Publish / build (push) Successful in 21s
2025-06-13 20:34:00 +02:00
leonarski_f ca69bb0094 DAQ: Deconvolute beam mark / beam center 2025-06-13 11:33:39 +02:00
leonarski_f bebb9c38d3 GUI: Raster is using more generalized DTZ/transmission settings 2025-06-12 21:20:40 +02:00
leonarski_f 0af369fd12 DAQLib: Introduce a dedicated structure for Diffraction geometry 2025-06-12 16:49:27 +02:00
leonarski_f c86cb10ee1 RasterGridRequest: Clean-up unused methods 2025-06-12 13:22:15 +02:00
leonarski_f 228d96bf7b GUI: Raster grid manager - work in progress 2025-06-11 12:02:12 +02:00
leonarski_f ef4dd537af DAQ Config: Add beam center storage
Build and Publish / build (push) Successful in 22s
2025-06-02 16:23:28 +02:00
leonarski_f 92f8d6257c DAQ Config: All BeamlineSettingsModel settings are optional, changed way elements are updated + added lock 2025-06-02 16:20:08 +02:00
leonarski_f 439a77b830 Add diffraction conversion routines 2025-06-02 15:37:39 +02:00
leonarski_f 7d65a18d28 Autofocus function
Build and Publish / build (push) Successful in 21s
2025-05-30 16:29:16 +02:00
leonarski_f b871124f8f Sample camera handling through DAQ and GUI 2025-05-30 12:03:30 +02:00
leonarski_f 1f0b4b5517 DaqLib: Merge helical/screening/standard scans 2025-05-30 10:55:36 +02:00
leonarski_f 3dd5b5a686 Server: Combine helical and rotation data collection in one data structure 2025-05-30 10:29:58 +02:00
leonarski_f 001a2d5b71 MXBeamline is moved to common part 2025-05-20 17:44:45 +02:00
leonarski_f e2a66507c8 Fixes at the BL 2025-05-19 16:10:30 +02:00
leonarski_f d2c33605c0 Fixes 2025-05-19 15:46:47 +02:00
leonarski_f f7115acb08 Models: Add shutter open, more logical parameter order 2025-05-19 15:19:33 +02:00
leonarski_f a38b3b055a Include everything in one repo, for better development
Build and Publish / build (push) Successful in 26s
2025-05-14 16:27:42 +02:00