mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity
497 Commits 121 Branches 90 Tags
a4ebe9fded019bf1fb1bd90cbdab16515b6856cd
Commit Graph
95 Commits
Author SHA1 Message Date
appleb_m a4ebe9fded DAQ: COM added debug statement, crystal_size logs crystal size and quality condition filter now uses max low res spots to create a threshold of 30% - currently hardcoded 2025-11-20 09:24:28 +01:00
appleb_m 41c50e64c5 DAQ: identify_crystal_raster - no longer uses indexed spots, always uses low res spots and now moves 0.5 so that it centres on a square not the corner 2025-11-20 09:23:11 +01:00
appleb_m e7b4d12f58 DAQ-find_xtal.py error messages 2025-11-18 17:38:29 +01:00
appleb_m 192e290a67 Update pyproject.toml for aaredaq to 0.2.6
Build and Publish / build (push) Failing after 26s
Details
2025-11-18 16:52:46 +01:00
appleb_m fc9b430de6 Update pyproject.toml for aaredaq 2025-11-18 16:51:23 +01:00
appleb_m e587f87c91 DAQ: added experiment hutch shutter to daq status model in models.py 2025-11-18 13:33:43 +01:00
leonarski_f b3502e722a GUI: Fluorescence further improvements 2025-11-13 11:31:29 +01:00
leonarski_f d321d219a3 GUI: Fluorescence improvements 2025-11-13 10:56:33 +01:00
leonarski_f 4833b06829 DAQ - Fluorescence spectrum allows to set transmission + energy is set correctly 2025-11-13 10:19:04 +01:00
leonarski_f 2fffeef0cf DAQ/GUI - Fluorescence spectrum in a single call 2025-11-13 09:01:05 +01:00
appleb_m 49068b4431 Loger - change default location for gui but not daq 2025-11-12 08:45:27 +01:00
appleb_m 05ce9ccd98 DAQ: updated default rotation settngs 2025-11-06 09:40:21 +01:00
appleb_m 5085477cf4 DAQ: updated default camera exposure settings for 6D 2025-11-06 09:40:07 +01:00
martinappleby 98d7e0bac3 DAQ: tidied up models for SimpleScanparameters and added optional filename for future work 2025-11-05 14:33:12 +01:00
martinappleby 0df121f03c COMMON: logger no longer looks for hardcoded yaml, but looks for a yaml in the format f"logging_{env}.yaml" where env is an environement varaible tos et the yaml to dev or prod and the path is dependnet on the logger_config file path. 2025-11-05 10:59:53 +01:00
leonarski_f 5260078db5 COMMON: updated logger_config.py to include a test and to log to connect the correct logger 2025-10-30 16:56:40 +01:00
leonarski_f cbe049a8e9 COMMON: logger_config.py, added QT log handling to enable a logging panel in the GUI 2025-10-30 11:02:19 +01:00
leonarski_f 9f2d8dce21 LOGGER: update config 2025-10-29 13:36:59 +01:00
leonarski_f 26c18de825 DAQ/GUI: updated face_detection.py, refactored mlbox.py to use pydantic models and to allow more functionality to be added to the analysis of the boxes 2025-10-29 13:34:09 +01:00
leonarski_f aa1d39f9b0 COMMON: logger_config.py fixed bug where config yaml was ignored 2025-10-21 12:38:36 +02:00
leonarski_f 803a313b82 DAQ: fixed bug where raster data collection would crash if img.spots were None 2025-10-20 17:29:03 +02:00
leonarski_f 0243d5c8b9 Merge branch 'daq_raster_predicition' 
# Conflicts:
#	daq/src/aaredaq/daq.py
#	gui/src/aaregui/panels/rotation_data_collection.py
 2025-10-20 12:48:47 +02:00
leonarski_f 1d8c17984e DAQ: added basic logging 2025-10-20 11:50:16 +02:00
leonarski_f a15c6c9c47 DAQ: moved raster calculations to find_xtal.py 2025-10-10 17:19:29 +02:00
leonarski_f 4e6e7fbaf6 DAQ: add SimpleScanParameters 2025-10-10 17:14:04 +02:00
leonarski_f 6d3d28f2c9 DAQ: moved raster calcualtion functions to a new script called find_xtal.py. WIP 2025-10-07 16:49:11 +02:00
leonarski_f 312eebc9c1 DAQ: added crystalsize model and added b_factor and crystal_size to models.py 2025-10-07 13:07:00 +02:00
leonarski_f e4db694c39 DAQ: and models.py - added last_best_res calculation and value to daq and models 2025-10-01 17:11:06 +02:00
leonarski_f 99d32326a7 diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta 2025-10-01 17:04:56 +02:00
leonarski_f ee626f83c2 diffraction_geometry: added poni_rot1_rad and poi_rot2_rad 2025-10-01 17:04:25 +02:00
leonarski_f 93453e6048 Diffraction geometry: Protect for asin out of (-1,-1) range 2025-10-01 09:09:40 +02:00
leonarski_f e7f1603a76 DAQ: zoom_manager function added to models.py and zoom_settings condensed into one function in config.py. This will be adapted when using redis and yaml files. 2025-09-30 15:44:07 +02:00
leonarski_f 8b09789370 DAQ: Add min/max dtz 2025-09-30 11:54:12 +02:00
leonarski_f 2b033b551f DAQ: Fix resolution to dtz routines 2025-09-30 11:53:55 +02:00
leonarski_f 478aea06fc DAQ: Add commissioning mode 2025-09-30 11:28:21 +02:00
leonarski_f 81404facde DAQ: zoom in BL state, work in progress 2025-09-30 09:18:57 +02:00
leonarski_f f479eac4fb AareGUI: Zoom settings for X06DA (work in progress) 2025-09-26 09:57:52 +02:00
leonarski_f 69b4dd6481 COMMON: logger_config.py added, WIP! 2025-09-19 16:19:12 +02:00
leonarski_f 46dad594ac COMMON: updated pyproject.toml jfjoch client version 2025-09-19 16:11:09 +02:00
leonarski_f eaeb76bf2a DAQ - MODELS: only loop centre on 1 x zoom 2025-09-18 10:07:57 +02:00
leonarski_f b0c97634d5 Daq - models: changed default gain value for user zoom settings at 2x zoom. 2025-09-11 14:36:45 +02:00
leonarski_f d507c19e79 Daq - models: added two zooms to auto loop centering and changed gain and exposure values. 2025-09-11 14:36:17 +02:00
leonarski_f a9321888c6 Removed logger usage and redundant debug messages from models.py. 2025-08-20 15:25:26 +02:00
GotthardG d47ce8be84 Introduce DataCollectionParameters model with validation and update dependencies
Build and Publish / build (push) Successful in 24s
Details 
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 80a473806d Updated aareDB dependency to version 0.1.1a22 in pyproject.toml. 2025-08-20 13:11:32 +02:00
leonarski_f 2c0a08f0c1 DAQ: updated gain value for loop centring to current value used. 2025-08-13 09:14:37 +02:00
leonarski_f 3eebdef584 DAQ: increased exposure time slightly for loop centering 2025-07-18 10:27:23 +02:00
leonarski_f 18e5520f35 DAQ: Add def_bl_zoom() function 2025-07-15 09:57:17 +02:00
leonarski_f a875c6a1d9 DAQ: Returning list of completed rasters 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