mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 77 Wiki Activity
179 Commits 128 Branches 93 Tags
344190831b052d7ae4634ea5b4321f5dd2fd165a
Commit Graph
103 Commits
Author SHA1 Message Date
leonarski_f 344190831b DAQ: updated grid_request parameters in __auto_center 2025-07-15 09:57:17 +02:00
leonarski_f 75cc75b10e DAQ: fixed bug in identify_crystal_raster where if filtered_images is none, none was given to max(). Now checks for this and uses all images if filtered_images is None 2025-07-15 09:57:17 +02:00
leonarski_f ad77ea9612 DAQ: rse2sa transition 2025-07-15 09:57:16 +02:00
leonarski_f d9fcfc4140 DAQ: Fix issue with TELL not mounting when gripper is in park 2025-07-15 09:57:16 +02:00
leonarski_f 61df56683e DAQ: JFJoch - save flux to HDF5 2025-07-15 09:57:16 +02:00
leonarski_f 327ab0accc DAQ: Two measurements for auto 2025-07-15 09:57:16 +02:00
leonarski_f a875c6a1d9 DAQ: Returning list of completed rasters 2025-07-15 09:57:16 +02:00
leonarski_f 000b597271 DAQ: Added auto-centering 2025-07-15 09:57:16 +02:00
leonarski_f 23a9ed826a DAQ: Workflows, put collimator down for sample exchange 2025-07-15 09:57:16 +02:00
leonarski_f dd6d429e8d DAQ: Check to see if sample exists and has a sample ID before trying to submit a screenshot to the database 2025-07-15 09:57:16 +02:00
leonarski_f 61287028ac DAQ: cryo at 50.0 for beam location 2025-07-15 09:57:16 +02:00
leonarski_f 007fbd356b DAQ: use wait=False just to be sure 2025-07-15 09:57:16 +02:00
leonarski_f 43a47bf861 DAQ: Fix dtz() 2025-07-15 09:57:16 +02:00
GotthardG 8b9dcd8cef Update dependencies and enhance WebSocket processing 
Updated `aareDB` and `aaredaqlib` dependencies to the latest versions. Enhanced WebSocket connection handling with improved message processing, error handling, and environment variable validation. Introduced additional logging for debugging and streamlined Redis spreadsheet updates.
 2025-07-11 21:23:01 +02:00
leonarski_f 4ea0b7fbcd DAQ: Updated identify_crystal_raster to filter images based on a ratio of ice spots to low res spots as well as if an image is indexed. Added tempoary logic to correctly calculate image grid positon. 2025-07-09 17:14:10 +02:00
leonarski_f 35249295e1 DAQ: automatically move to an optimal data collection point following a grid scan. Bug fix in _draw_grid to check if values[pxl] is None. 2025-07-08 11:50:57 +02:00
leonarski_f 6fb53e9bbd DAQ: change exposure and gain based of off zoom. Interpolates gain and exposure if zoom value is not in redis. 2025-07-07 11:36:04 +02:00
leonarski_f 6a7c84ec66 DAQ: fixed potential bug where current_sample.db_id was always sent during auto loop centering. 2025-07-07 09:51:33 +02:00
leonarski_f 43cd75d3a9 DAQ: now sends sample collected to the db after jfjoch has finished writing 2025-07-04 17:40:05 +02:00
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
Details
2025-06-26 13:48:21 +02:00
leonarski_f 27a00597ca VERSION: 0.2.2
Build and Publish / build (push) Successful in 21s
Details
2025-06-26 13:45:57 +02:00
leonarski_f fd7a7adaab RELEASE: 0.2.1
Build and Publish / build (push) Successful in 21s
Details
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
Details 
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
Details 
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
Details
2025-06-24 12:55:42 +02:00