 appleb_m
|
9f85c07965
|
models: bug where sample_id and attach_image where twice follwoign rework
|
2025-12-12 14:35:10 +01:00 |
|
|
appleb_m
|
24f26a5d40
|
Models: rearranged the order in ScanResultPayloadModel to be consistent elsewhere.
|
2025-12-12 14:29:32 +01:00 |
|
|
appleb_m
|
b4e1961a16
|
ScanResultPayloadModel addded
|
2025-12-11 12:02:52 +01:00 |
|
|
GotthardG
|
864f7aa005
|
DAQ: Adding run_number into SampleShortInfo model
Build and Publish / build (push) Successful in 23s
|
2025-12-10 10:28:01 +01:00 |
|
 appleb_m
|
6633578e2c
|
pyprojeccttoml for common updated to most recent jfjoch version
|
2025-12-04 11:30:19 +01:00 |
|
|
appleb_m
|
c43e28b92e
|
Logger_config: should now expand ~ correctly in filepath
|
2025-12-04 11:29:58 +01:00 |
|
|
appleb_m
|
366581b397
|
DAQ: cx and cy were flipped in get_result_list_from_com
|
2025-12-04 11:29:39 +01:00 |
|
|
appleb_m
|
0c435202d0
|
Beamline: checks beamline env for RHEL9. Backwards compatible with RHEL8
|
2025-11-28 16:59:36 +01:00 |
|
|
appleb_m
|
d584409b0d
|
Update toml to 0.2.66
|
2025-11-27 13:02:58 +01:00 |
|
|
appleb_m
|
04bae45c8c
|
daq: bug/typo shoud be maximage.nx not .n_x
|
2025-11-27 13:02:20 +01:00 |
|
|
appleb_m
|
b9d86bad90
|
toml update to 0.2.65
|
2025-11-27 12:55:27 +01:00 |
|
|
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
|
e72f30db23
|
DAQ/GUI: pyproject to 0.2.63
Build and Publish / build (push) Successful in 25s
|
2025-11-25 16:20:01 +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
|
f310d56533
|
Common: update version to 0.2.61
|
2025-11-21 11:07:37 +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
|
192e290a67
|
Update pyproject.toml for aaredaq to 0.2.6
Build and Publish / build (push) Failing after 26s
|
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 |
|