mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity
355 Commits 121 Branches 90 Tags
41687a4902e65eab6b6a97d2f68b331bcfbb910a
Commit Graph
355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
leonarski_f 41687a4902 DAQ: bug fix after raster where smargon tried to nudge with None, None. 2025-10-21 16:49:21 +02:00
leonarski_f 08eb442561 DB: correclty multiple beamsize by 1000 instead of 100 for raster and rotation 2025-10-21 15:33:01 +02:00
leonarski_f 7a49de2530 DAQ: removed move to cold when in park 2025-10-21 12:39:42 +02:00
leonarski_f 0f35b559be DAQ: changed default log location to local. 2025-10-21 12:39:30 +02: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 d3ab570b54 MLBOX: updated model to v8_20102025 2025-10-21 12:38:10 +02:00
leonarski_f 5334d6c2c3 WORKFLOWS: removed manual move to cold in rse2sa and from dh2sa 2025-10-21 12:37:46 +02:00
leonarski_f a58f1c5d80 WORKFLOWS: removed manual move to cold in rse2sa and from dh2sa 2025-10-21 12:37:41 +02:00
leonarski_f 6be02cc1cd WORKFLOWS: added logging 2025-10-21 12:37:04 +02:00
leonarski_f b00bebe0ab DAQ: if no sample, sample name called unknown_sample to allow debugging rotation and raster scans 2025-10-20 17:29:51 +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 085b1b966e DAQ: temporarily removed logger error as it was triggering during server startup 2025-10-20 17:28:35 +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 1e42d76ded DAQ: added face detection 2025-10-17 16:11:05 +02:00
leonarski_f 87c20e0f9e TELL: Updated Error message for move_cold 2025-10-17 16:08:32 +02:00
leonarski_f 9316a8a2eb DAQ: update mlbox to get ml predictions via http 2025-10-16 16:53:20 +02:00
leonarski_f 4dc2b0def1 Merge remote-tracking branch 'origin/prediction' into prediction 
# Conflicts:
#	gui/src/aaregui/gui.py
#	gui/src/aaregui/widgets/camera_image.py
 2025-10-16 13:13:50 +02:00
leonarski_f c3e454a504 Prediction (WIP) 2025-10-16 13:11:48 +02:00
GotthardG 4ef8203117 Adding prediction zmq and drawing in camera image 2025-10-16 13:11:48 +02:00
leonarski_f 919a035f59 Merge remote-tracking branch 'origin/daq_raster_predicition' into daq_raster_predicition 
# Conflicts:
#	daq/src/mxlibs3/jfjoch.py
#	gui/src/aaregui/panels/smart_rotation_panel.py
 2025-10-16 13:02:58 +02:00
leonarski_f 173c4ea304 Workflows: tempoarily remove reflector and close detector cover to improve ML 2025-10-16 13:00:36 +02:00
leonarski_f 834e180067 GUI: reverted to previous comit due to missing changes in smart_rotation_panel.py needs testing with data collection 2025-10-16 13:00:11 +02:00
leonarski_f 432dc8e3af GUI: set default sort column to Location 2025-10-16 12:42:07 +02:00
leonarski_f ae7b538072 DAQ/GUI: mount uses refernce tools if reference=True otherwise uses sample spreadsheet 2025-10-16 12:40:55 +02:00
leonarski_f e8c1040bec GUI: updated reference_tools_panel.py and connected update_daq_status 2025-10-16 12:40:03 +02:00
leonarski_f 4cd7c865f7 GUI: updates to reference_tools_panel.py WIP 2025-10-16 11:05:36 +02:00
leonarski_f cfea7df27c GUI: added reference tool panel to tell samples dock as a tab 2025-10-16 11:04:49 +02:00
leonarski_f 0a0b241488 GUI: connected load_reference_tools 2025-10-16 11:04:16 +02:00
GotthardG aabd435c6f DAQ: Implementation of reference-tools get methods from redis 
GUI: Adding reference tools panel with mount and unmount functions
 2025-10-15 15:18:29 +02:00
Guillaume Cyril Gotthard 7f4c9f1d72 WIP 2025-10-14 11:23:32 +02:00
leonarski_f 0b9f21b9a1 DAQ: temporarily disabled reflector and closed detector cover during sample alignment for better ML. 2025-10-10 17:20:55 +02:00
leonarski_f c612eb0966 SERVER: connected set_smart_params 2025-10-10 17:19:50 +02:00
leonarski_f a15c6c9c47 DAQ: moved raster calculations to find_xtal.py 2025-10-10 17:19:29 +02:00
leonarski_f 34acca20e8 DAQ: updated when b_factor and best res are calculated and better error handling during auto center 2025-10-10 17:19:16 +02:00
leonarski_f e3a19b51ba DAQ: added smart params 2025-10-10 17:18:30 +02:00
leonarski_f c7378f7e02 DAQ-WORKER: connected simplescanparameters with GUI panel and DAQ 2025-10-10 17:18:03 +02:00
leonarski_f 11bc0e5363 GUI: added parameters_changed and updated PONI values in defaults 2025-10-10 17:16:56 +02:00
leonarski_f f624fce97d GUI: added data to file path for rotation data collection 2025-10-10 17:16:21 +02:00
leonarski_f be0d9382d6 GUI: updated features to smart_rotation_panel.py 2025-10-10 17:14:47 +02:00
leonarski_f 4e6e7fbaf6 DAQ: add SimpleScanParameters 2025-10-10 17:14:04 +02:00
leonarski_f bb476669cc GUI: add data to filepath for rotation scan 2025-10-07 17:04:24 +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 f1f792d0e9 GUI: added functionality to add data to file_prefix for rotation scan only. 2025-10-07 14:48:08 +02:00
leonarski_f e1fca441d6 DAQ: best_res should be min value not max 2025-10-07 13:16:41 +02:00
leonarski_f 3519072651 DAQ: updated raster COM calculation to send crystal size, b_factor and res estimate to daq status and to do COM on both y and x scans 2025-10-07 13:16:02 +02:00
leonarski_f 8cf7cb01ca DAQ: reset crystalsize b_facror and best_res when loading a new sample 2025-10-07 13:14:01 +02:00
leonarski_f 5f10bbf077 DAQ: import crystalsize from models.py 2025-10-07 13:13:11 +02:00
leonarski_f acca3d27a1 DAQ: added crystal_size b_factor and best_res to daq_status 2025-10-07 13:12:30 +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