Commit Graph
54 Commits
Author SHA1 Message Date
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 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
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 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
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 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 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 99305a473e DAQ: Added CryojetSettings as a seperate model in config and implemented in DAQ. 2025-07-03 14:15:05 +02:00
leonarski_f 606f1b62fb GUI: Add completed grid scan table 2025-06-29 12:19:47 +02:00
leonarski_f 1d9c8133c1 DAQ+GUI: Work in progress 2025-06-26 12:12:36 +02:00
leonarski_f 33b242eca6 DAQ: Add beam location 2025-06-25 12:32:45 +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
leonarski_f 8271db82c2 DAQ/GUI: Improvements during the beamtime 2025-06-20 13:49:55 +02:00
leonarski_f 8c517d4bab DAQ: Modifications of June 18th 2025-06-18 13:27:00 +02:00
leonarski_f 3c7ae33b80 GUI: Add beamline name to BeamlineStatus
Build and Publish / build (push) Successful in 23s
2025-06-17 16:22:36 +02:00
leonarski_f dafda5adcb GUI: Add detector description and serial number
Build and Publish / build (push) Successful in 22s
2025-06-17 16:16:54 +02:00
leonarski_f 4e15624036 GUI: Move sample in Smargon Z with shift+click 2025-06-17 11:00:29 +02:00
leonarski_f a126f7ccb4 DAQ/GUI: Fixes during pre-beamtime test (2)
Build and Publish / build (push) Successful in 22s
2025-06-17 10:44:50 +02:00
leonarski_f 451bd9f772 Models: Use jfjoch client result structure (WIP)
Build and Publish / build (push) Successful in 21s
2025-06-16 08:37:52 +02:00
leonarski_f 49a9f35e55 GUI: Minor improvements to grid scan result display
Build and Publish / build (push) Successful in 21s
2025-06-13 20:34:00 +02:00
leonarski_f ca69bb0094 DAQ: Deconvolute beam mark / beam center 2025-06-13 11:33:39 +02:00
leonarski_f bebb9c38d3 GUI: Raster is using more generalized DTZ/transmission settings 2025-06-12 21:20:40 +02:00
leonarski_f 0af369fd12 DAQLib: Introduce a dedicated structure for Diffraction geometry 2025-06-12 16:49:27 +02:00
leonarski_f c86cb10ee1 RasterGridRequest: Clean-up unused methods 2025-06-12 13:22:15 +02:00
leonarski_f 228d96bf7b GUI: Raster grid manager - work in progress 2025-06-11 12:02:12 +02:00
leonarski_f ef4dd537af DAQ Config: Add beam center storage
Build and Publish / build (push) Successful in 22s
2025-06-02 16:23:28 +02:00
leonarski_f 92f8d6257c DAQ Config: All BeamlineSettingsModel settings are optional, changed way elements are updated + added lock 2025-06-02 16:20:08 +02:00
leonarski_f 439a77b830 Add diffraction conversion routines 2025-06-02 15:37:39 +02:00
leonarski_f 7d65a18d28 Autofocus function
Build and Publish / build (push) Successful in 21s
2025-05-30 16:29:16 +02:00
leonarski_f b871124f8f Sample camera handling through DAQ and GUI 2025-05-30 12:03:30 +02:00
leonarski_f 1f0b4b5517 DaqLib: Merge helical/screening/standard scans 2025-05-30 10:55:36 +02:00
leonarski_f 3dd5b5a686 Server: Combine helical and rotation data collection in one data structure 2025-05-30 10:29:58 +02:00
leonarski_f 001a2d5b71 MXBeamline is moved to common part 2025-05-20 17:44:45 +02:00