appleb_m
cf55c447d4
models.py: updated simplestrategyinputmodel paramters
2025-11-18 16:27:52 +01:00
martinappleby
32b6dd397a
Common: updated simplescanparameters and added in input
2025-11-18 14:25:42 +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
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
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
4e6e7fbaf6
DAQ: add SimpleScanParameters
2025-10-10 17:14:04 +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
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
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
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
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
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
ca69bb0094
DAQ: Deconvolute beam mark / beam center
2025-06-13 11:33:39 +02:00
leonarski_f
0af369fd12
DAQLib: Introduce a dedicated structure for Diffraction geometry
2025-06-12 16:49:27 +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
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
e2a66507c8
Fixes at the BL
2025-05-19 16:10:30 +02:00
leonarski_f
d2c33605c0
Fixes
2025-05-19 15:46:47 +02:00
leonarski_f
f7115acb08
Models: Add shutter open, more logical parameter order
2025-05-19 15:19:33 +02:00
leonarski_f
a38b3b055a
Include everything in one repo, for better development
Build and Publish / build (push) Successful in 26s
2025-05-14 16:27:42 +02:00
appleb_m
martinappleby
leonarski_f