 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 |
|
 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
|
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
|
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
|
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
|
34b614a166
|
DAQ: added last_best_res to daq status
|
2025-10-01 17:11:29 +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
|
19d5740c1f
|
diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta
|
2025-10-01 17:06:43 +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
|
b36b42b131
|
MLBox: updated default best.pt file
|
2025-10-01 17:03:38 +02:00 |
|
|
leonarski_f
|
bb78102786
|
AUTOMATION PARAMETERS: full_flux added to daq
|
2025-09-30 17:13:52 +02:00 |
|
|
leonarski_f
|
64d8fea010
|
DAQ: ABR bug - tried to go to -10, then 8. Now goes to a set coordiante of -26,0,0
|
2025-09-30 15:45:17 +02:00 |
|
|
leonarski_f
|
6969b1ee4d
|
DAQ: detector cover logic adapted
|
2025-09-30 15:44:53 +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
|
b8b3e1b900
|
DAQ: config.py fixed bug in bl_zoom_settings which was requesting user zoom settings not bl_zoom_settings
|
2025-09-30 13:29:05 +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
|
6e7dfe5ff8
|
DAQ: workflows.py when move to bl from sa cryo now moves to 80
|
2025-09-30 10:29:18 +02:00 |
|
|
leonarski_f
|
59ba7224b9
|
DAQ: Custom JWT key must be used
|
2025-09-30 09:24:34 +02:00 |
|
|
leonarski_f
|
b20609089c
|
DAQ: Authentication for staff operations checks if session is active for the user
|
2025-09-30 09:21:49 +02:00 |
|
|
leonarski_f
|
81404facde
|
DAQ: zoom in BL state, work in progress
|
2025-09-30 09:18:57 +02:00 |
|
 appleb_m
|
a901745da4
|
DAQ: workflows.py change to sa2bln to get samcam_settings from bl_zoom_settings
|
2025-09-29 17:04:39 +02:00 |
|
|
appleb_m
|
941936eb3b
|
DAQ: devices.py: more verbose print statement in samcam_settings
|
2025-09-29 11:57:28 +02:00 |
|
|
appleb_m
|
80aa1466af
|
DAQ - config: added property and setter for bl_zoom_settings. Setting zoom checks cfg_state for beamlocation. TODO: tidy up zoom functions - combine them using self.state in config.py?
|
2025-09-29 11:54:19 +02:00 |
|
|
leonarski_f
|
72ceb80a88
|
AareDAQ: Remove extra verbose print
|
2025-09-25 19:52:24 +02:00 |
|
|
leonarski_f
|
b116641d9f
|
AareDAQ: RHEL9 provides lowercase groups, so fix to lowercase and add unx-sls_mx to "staff" groups
|
2025-09-25 09:03:01 +02:00 |
|
|
leonarski_f
|
9e223d0fd6
|
AareDAQ: fix state_busy flag in sample setter
|
2025-09-25 08:55:54 +02:00 |
|
|
leonarski_f
|
40a7ae6c5e
|
AareDAQ: Handle p-groups correctly (as a list) in the server
|
2025-09-25 08:54:37 +02:00 |
|
|
leonarski_f
|
49823f54a9
|
AAREDB: WIP changes to ingest RASTER grid scan into DB
|
2025-09-19 16:19:40 +02:00 |
|
|
leonarski_f
|
dd310accfd
|
DAQ: when __set_state is called check to see if beamline is busy otherwise raise an exception
|
2025-09-19 16:18:35 +02:00 |
|
|
leonarski_f
|
688c635be7
|
DAQ: temporarily disabled ALC when manually mounting - should be an option in the GUI to enable/disable
|
2025-09-19 16:17:05 +02:00 |
|
|
leonarski_f
|
9c43eea736
|
DAQ: updated alc and raster scan. ALC now does two attempts, if it finds a good angle, goes abck and tries to rotate 90 degrees in other direction. Raster now uses a scipy COM calculation. paramters currently can be picked in daq but should come as a choice from the GUI. Need to optimise parameters
|
2025-09-19 16:16:22 +02:00 |
|
|
leonarski_f
|
8b07cae1db
|
DAQ: update to automation parameters. Added a flag for low res data to make det dist switch quicker. Needs a panel in the GUI!
|
2025-09-19 16:14:06 +02:00 |
|
|
leonarski_f
|
7e02c537eb
|
DAQ - ALC: added error message to database when ALC fails for manual sample collection
|
2025-09-18 10:11:49 +02:00 |
|
|
leonarski_f
|
77d81c182e
|
DAQ: attempted fix of sample_geometry bug to handle error when the ABR disconnects.
|
2025-09-18 10:11:10 +02:00 |
|
|
leonarski_f
|
2c15b42454
|
TELL: Reduce polling rate from 100 Hz to 5 Hz + increase timeout on mount
|
2025-09-15 09:59:03 +02:00 |
|
|
leonarski_f
|
8e64047b0a
|
AareDAQ: Improved fix for mounted sample position error
|
2025-09-15 08:53:50 +02:00 |
|
|
leonarski_f
|
8950435daa
|
AAREDB: auto crystal centering failed event submission added
|
2025-09-11 14:54:20 +02:00 |
|
|
leonarski_f
|
5f94ccd9d2
|
DAQ - MLBOX: adapting logic in MLBOX predictions now looks at multiple classes: face, crystal loop and pin.
|
2025-09-11 14:52:21 +02:00 |
|
|
leonarski_f
|
6f7dbdede9
|
DAQ: measure - changes zoom back to 1 before changing sample
|
2025-09-11 14:51:21 +02:00 |
|
|
leonarski_f
|
b9b32769ca
|
DAQ: __loop_center_sequence: now uses ml_loop_centre_box. If it does not find a target moves on
|
2025-09-11 14:50:51 +02:00 |
|