mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity
190 Commits 121 Branches 90 Tags
032dfec906a6d8cbeffd079c330db7e2c0d9b0ce
Commit Graph
190 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a3dc4fff28 SCRIPTS: Addded knife edge scan jupyter notebook 2025-07-15 10:16:08 +02:00
leonarski_f 2caef2a632 DAQ: WIP on zoom 2025-07-15 09:57:17 +02:00
leonarski_f e879c1b757 GUI: More adjustments to paths 2025-07-15 09:57:17 +02:00
leonarski_f 47d24e17d1 GUI: Force paths for common data collection modes 2025-07-15 09:57:17 +02:00
leonarski_f 18e5520f35 DAQ: Add def_bl_zoom() function 2025-07-15 09:57:17 +02:00
leonarski_f b99a126578 GUI: Use 4 digit year 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 d672ce8780 GUI: Tweak defaults for ABR step and rotation/screening 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 58df388409 DAQ: Fix issues with DAQ status updates 2025-07-15 09:57:16 +02:00
leonarski_f 5ce803ad0c DAQ: JFJoch viewer - modification to DBus, always provide file name to LoadImage 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 a245771ebd GUI: Dedicated directory for raster files 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 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