Commit Graph
128 Commits
Author SHA1 Message Date
leonarski_f ead75f8d29 aaredb: added alc_failed event message 2025-09-03 10:16:33 +02:00
leonarski_f f7166a6619 Tell Client: added X as an allowed position (reference puck) 2025-09-02 17:23:59 +02:00
leonarski_f bd9a24bc17 DAQ: additional error handling for magnet controller status failure 2025-09-02 17:23:22 +02:00
leonarski_f 471f853663 DAQ: changed error handling so if rotation scan only happens if ALC succeeds and otherwise continues to next sample 2025-09-02 16:44:45 +02:00
leonarski_f 44059ac8fd DAQ: Reenable TELL after doors opened and locked 2025-08-25 15:38:22 +02:00
GotthardG d47ce8be84 Introduce DataCollectionParameters model with validation and update dependencies
Build and Publish / build (push) Successful in 24s
Added a new `DataCollectionParameters` model in `aaredaqlib` with extensive field validation and default handling for increased robustness. Updated `aaredaqlib`, `aaredb`, and related dependencies to version `0.2.4` for consistency across modules. Enhanced logging for better visibility during validation.
2025-08-20 15:13:05 +02:00
leonarski_f 2452d47475 DAQ: For vertical grid scan in auto centering, use a smaller y step. 2025-08-13 09:19:12 +02:00
leonarski_f efa8e611f9 DAQ: Changed exposure time in auto_center raster grid request from 0.05 to 0.01 2025-08-13 09:16:39 +02:00
leonarski_f 1afdb5851b DAQ: added any(img.spots > 0) and a backgroudn thershold check to identify crystall raster. 2025-08-13 09:15:44 +02:00
leonarski_f 092cf6593f DAQ: removed auto from automated data collection filename (user request) 2025-07-21 10:09:19 +02:00
leonarski_f abab0aac10 DAQ: Added further complexity to identify_crystal_raster. Looking at the number of spots indexed, and if multiple images with this value, selects the median image number 2025-07-17 14:27:19 +02:00
leonarski_f 8146184fad DAQ: Changed zoom settings before auto_center in measure, and added a random hex string to the sample_prefix to prevent data overwrite 2025-07-17 14:27:19 +02:00
leonarski_f c73ac8d880 DAQ: error handling for loop centering. Following loop centering change to higher zoom for ML box 2025-07-17 14:27:19 +02:00
leonarski_f c50dd0f047 DAQ: fixed bug where ml box screenshots where not sent correctly to the db 2025-07-17 14:27:19 +02:00
leonarski_f 7d33785563 DAQ: send sample failed event to the database during automatic data collection if something fails. 2025-07-17 14:27:19 +02:00
leonarski_f afbd07a79d DAQ: added aaredb events to send an error message event to the db 2025-07-17 14:27:19 +02:00
GotthardG 14c8780616 Refactor WebSocket handling and remove redundant functions
Improved error handling for WebSocket connections by wrapping `ws.run_forever()` in a try-except block. Simplified `tellupdater` by removing unused functions (`convert_pucks` and `pucks_equal`) and ensuring consistent puck state updates. Enhanced logging for better traceability during WebSocket operations.
2025-07-16 16:56:38 +02:00
leonarski_f 09be1864a5 GUI: Run viewer to check online X-ray images 2025-07-16 16:49:46 +02:00
leonarski_f 415ba64b78 DAQ: Automation (WIP) 2025-07-15 16:29:31 +02:00
leonarski_f 032dfec906 DAQ: Handle transmission/dtz null 2025-07-15 14:46:12 +02:00
leonarski_f 9a3655a8e1 DAQ: Automated scan (WIP) 2025-07-15 12:55:03 +02:00
leonarski_f 2caef2a632 DAQ: WIP on zoom 2025-07-15 09:57:17 +02:00
leonarski_f cac3b67dde DAQ: Always add "raster/" for rasters (remove {type} in GUI) 2025-07-15 09:57:17 +02:00
leonarski_f de4b94bc93 DAQ: Always add "raster/" for rasters 2025-07-15 09:57:17 +02:00
leonarski_f 1468a1211c DAQ: tries to create ml_bounding_box, if it fails moves to 90 degrees and updates file_prefix. 2025-07-15 09:57:17 +02:00
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