Commit Graph
84 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 6bc3ed2eae DAQ: sample setter now clears manual sample. removed sample_clear. Manual sample must still be unmounted by hand. 2025-07-04 11:59:36 +02:00
leonarski_f 4324a814de DAQ: Omega vector is (-1,0,0) in NeXus coordinate system - for AutoProc 2025-07-04 11:53:56 +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 804d18db4d DAQ: fixed bug where mark beam worked in sample alignment and not beam location 2025-07-03 15:49:33 +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 9f29f3036f DAQ: Align raster vertical scan 2025-06-30 11:57:26 +02:00
leonarski_f 98499e8af8 DAQ: Fix collimator position 2025-06-30 11:56:13 +02:00
leonarski_f a05222d543 DAQ: Reset zoom after mount 2025-06-29 11:11:14 +02:00
leonarski_f 043a5eef45 GUI: Manual sample panel (WIP) 2025-06-29 11:10:50 +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 467d754a4f DAQ: Fix lamp light being overwritten + handle transmission being None 2025-06-26 09:43:07 +02:00
GotthardG 5024963eba Add method to insert manual samples into the database
Introduce `create_manual_sample` method to handle the creation of manual samples using `SampleShortInfo`. This includes optional handling of data collection parameters and integrates with the existing API for database insertion.
2025-06-25 17:38:53 +02:00
GotthardG 2cca9c52eb Add method to insert manual samples into the database
Introduce `create_manual_sample` method to handle the creation of manual samples using `SampleShortInfo`. This includes optional handling of data collection parameters and integrates with the existing API for database insertion.
2025-06-25 17:37:44 +02:00
GotthardG a3cc9f29a7 Add method to insert manual samples into the database
Introduce `create_manual_sample` method to handle the creation of manual samples using `SampleShortInfo`. This includes optional handling of data collection parameters and integrates with the existing API for database insertion.
2025-06-25 17:37:17 +02:00
leonarski_f 59539f80d4 DAQ: Beam location, work in progress 2025-06-25 16:08:04 +02:00
GotthardG d5887363ef Update WebSocket URL and improve data handling/debugging
Updated the WebSocket URL to point to the "tell_runner_router" path. Added detailed debug logging for incoming messages and refined data parsing to handle both "samples" dicts and raw lists. Removed commented-out code and ensured processed data is written to Redis with appropriate logging.
2025-06-25 14:40:38 +02:00
leonarski_f 5f6e09102f DAQ: SSE work in progress 2025-06-25 13:35:30 +02:00
leonarski_f 33b242eca6 DAQ: Add beam location 2025-06-25 12:32:45 +02:00
GotthardG a1a5ad2ec1 Implement WebSocket-based spreadsheet updater with Redis caching
Replaced polling-based sample info retrieval with a WebSocket-based approach for real-time updates. Introduced Redis integration for caching the processed spreadsheet, improving performance and data accessibility. Added structured logging, error handling, and graceful shutdown for better reliability and maintainability.
2025-06-25 11:41:56 +02:00
leonarski_f 2efaa4dd88 DAQ: Add spreadsheetupdater.py 2025-06-25 11:26:10 +02:00
leonarski_f f7734b4355 BeamlineConfig: Store spreadsheet 2025-06-25 10:57:33 +02:00
leonarski_f 8ec6c04c05 DAQ: Show flux 2025-06-25 10:04:51 +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
GotthardG d0c777decd Refactor SSE listener and improve logging for TELL updates
Build and Publish / build (push) Successful in 21s
Enhanced the SSE listener with better error handling and debug logs. Added checks for missing TELL URL and improved event data handling for "DewarContentUpdate". This ensures robustness and clarity in handling TELL updates.
2025-06-24 13:08:08 +02:00
GotthardG f14e652edd Refactor SSE listener and improve logging for TELL updates
Build and Publish / build (push) Successful in 22s
Enhanced the SSE listener with better error handling and debug logs. Added checks for missing TELL URL and improved event data handling for "DewarContentUpdate". This ensures robustness and clarity in handling TELL updates.
2025-06-24 13:07:02 +02:00
leonarski_f 7314a9dbf7 DAQ: Turn on front light after going from the sample alignment
Build and Publish / build (push) Successful in 23s
2025-06-24 12:55:42 +02:00
leonarski_f dee1fea329 DAQ: Offset Y for 2D raster scan only 2025-06-24 12:55:21 +02:00
leonarski_f eca90e7c51 DAQ: Raster scan fixes 2025-06-24 11:51:58 +02:00
leonarski_f 7298f75dfa DAQ: Minor fixes to logic for setting up JFJoch dataset 2025-06-24 11:12:33 +02:00
GotthardG 35e7ad3ce0 Add SSE client support for TELL updates and enhance resilience
Build and Publish / build (push) Successful in 21s
Replaced periodic polling with an SSE-based listener for real-time TELL updates, improving efficiency and responsiveness. Enhanced WebSocket client logic by implementing automatic reconnection. Updated dependencies to include `sseclient` and upgraded `aaredb` for compatibility.
2025-06-24 11:07:01 +02:00
leonarski_f 88199c8d49 GUI: For raster scan, one can browse through images 2025-06-23 13:11:45 +02:00
leonarski_f 49d57e66e4 DAQ: Token validity = 1 1 week 2025-06-21 14:04:16 +02:00
leonarski_f 8271db82c2 DAQ/GUI: Improvements during the beamtime 2025-06-20 13:49:55 +02:00
leonarski_f 855e2471c3 DAQ: ring current is always non-negative number
Build and Publish / build (push) Successful in 23s
2025-06-18 21:15:59 +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 d66f758ff3 Added functions to create rotation and gridscans runs into aaredb.py
Build and Publish / build (push) Successful in 22s
2025-06-18 13:23:19 +02:00
leonarski_f c670668dd0 DAQ: Integration of AareDB code (WIP)
Build and Publish / build (push) Successful in 22s
2025-06-18 11:17:34 +02:00
leonarski_f 44bc0046fb DAQ: Integration of AareDB code
Build and Publish / build (push) Successful in 22s
2025-06-18 10:30:12 +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
GotthardG bf170cfcf5 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 14:15:40 +02:00