mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity
467 Commits 121 Branches 90 Tags
ReferenceToolSort
Commit Graph
467 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
leonarski_f 23a9ed826a DAQ: Workflows, put collimator down for sample exchange 2025-07-15 09:57:16 +02:00
leonarski_f 488386597f GUI: Potential fix to camera thread exit issue 2025-07-15 09:57:16 +02:00
leonarski_f 63d0acc227 GUI: Add beamline camera view 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 88e639b070 DAQ: Switch to raster panel from rotation panel if change is made to the drawn grid 2025-07-15 09:57:16 +02:00
leonarski_f 0fcdd13c5a DAQ: always check proper file is open in the viewer 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 edbdab6625 GUI: Add spot ice ratio to the drop down panel and grid scan result visualisation. Fixed bug where spot count (ice) wasn't being correctly parsed to the GUI. 2025-07-09 17:15:20 +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 2d4acf868d GUI: Display spots ice/spots indexed 2025-07-08 13:21:16 +02:00
leonarski_f 6f7945175b Common: Increase jfjoch_client to rc.61 2025-07-08 13:18:53 +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 7c03965302 GUI: if left_click_event occurs outside of camera image area, no longer moves smargon. 2025-07-07 09:57:00 +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 053daa24ff GUI: On new sample set data collection tab to raster 2025-06-30 22:37:36 +02:00
leonarski_f b6a91aa952 GUI: Fix rotation/screening titles and dose vertical alignment 2025-06-30 14:49:05 +02:00
leonarski_f 0c347783b7 GUI: Fix menu not loading in beam location mode 2025-06-30 14:44:30 +02:00
leonarski_f a3d937fb07 GUI: Fix logic to update grid scan size 2025-06-30 14:41:35 +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 606f1b62fb GUI: Add completed grid scan table 2025-06-29 12:19:47 +02:00
leonarski_f 518e3df0d6 GUI: Grid scan WIP 2025-06-29 11:18: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
0.2.3 		2025-06-26 13:48:21 +02:00
leonarski_f 27a00597ca VERSION: 0.2.2
Build and Publish / build (push) Successful in 21s
Details
0.2.2 		2025-06-26 13:45:57 +02:00
leonarski_f fd7a7adaab RELEASE: 0.2.1
Build and Publish / build (push) Successful in 21s
Details
0.2.1 		2025-06-26 13:32:36 +02:00
leonarski_f b27d28b6a1 DAQ+GUI: Work in progress 2025-06-26 13:28:50 +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
leonarski_f f88ce1e422 GUI: Minor fix 2025-06-26 09:42:20 +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 5b9169f2cf Removed test.ipynb from git tracking 2025-06-25 13:36:35 +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