 appleb_m
|
7f0d06637d
|
DAQ: bug fixes in new implementation of raster ingest, plus send COM too GUI for JFJoch viewer
Build and Publish / build (push) Failing after 26s
|
2025-11-27 12:54:21 +01:00 |
|
|
appleb_m
|
e8b03539dd
|
DAQ/: bug fixes in new implementation
Build and Publish / build (push) Successful in 23s
|
2025-11-27 12:31:45 +01:00 |
|
|
appleb_m
|
d30729f655
|
DAQ/AAREDB: update how raster messages are sent to the db - now include COM, max_iamge number, beam_size and beamLocation.
|
2025-11-27 12:20:09 +01:00 |
|
|
appleb_m
|
6f5701e700
|
find_Xtal - COM calculation bug fix
|
2025-11-25 18:01:22 +01:00 |
|
 leonarski_f
|
49369927b3
|
DAQ/GUI: correctly setup logger in files.
|
2025-11-25 14:52:54 +01:00 |
|
|
leonarski_f
|
53e941f4e4
|
DAQ/GUI: update to version 0.2.62 - changed how raster scan works so always relative to top left corner of grid. This is then corrected in the appropriate places and has been updated in the visualiser
|
2025-11-25 14:46:39 +01:00 |
|
|
leonarski_f
|
3f8f51d74a
|
Model: added two macros to models for puck and positionm, currently legacy macros sgpuck and sgposition are kept.
|
2025-11-25 09:13:54 +01:00 |
|
|
leonarski_f
|
60e8b223f3
|
Find_crystal: add new filter for 30% max spots.
|
2025-11-25 09:12:13 +01:00 |
|
|
leonarski_f
|
f60fee1976
|
Find_crystal: fix bug in quality filter and add new filter for 30% max spots.
|
2025-11-25 09:11:58 +01:00 |
|
|
appleb_m
|
1427e6d71f
|
Common: change default value for directory
|
2025-11-21 11:06:56 +01:00 |
|
|
appleb_m
|
096e8297ed
|
COMMON: models - added SImpleScanParameters and SimpleStrategyInputModel
|
2025-11-20 09:26:24 +01:00 |
|
|
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
|
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
|
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 |
|