 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
|
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
|
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
|
ae7b538072
|
DAQ/GUI: mount uses refernce tools if reference=True otherwise uses sample spreadsheet
|
2025-10-16 12:40:55 +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
|
ee626f83c2
|
diffraction_geometry: added poni_rot1_rad and poi_rot2_rad
|
2025-10-01 17:04:25 +02:00 |
|
|
leonarski_f
|
bb78102786
|
AUTOMATION PARAMETERS: full_flux added to daq
|
2025-09-30 17:13:52 +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 |
|
 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
|
9e223d0fd6
|
AareDAQ: fix state_busy flag in sample setter
|
2025-09-25 08:55:54 +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
|
8e64047b0a
|
AareDAQ: Improved fix for mounted sample position error
|
2025-09-15 08:53:50 +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 |
|
|
leonarski_f
|
6394554334
|
DAQ: __loop_center. bug fix, added iteration to function parameters
|
2025-09-11 14:49:59 +02:00 |
|
|
leonarski_f
|
88d36f8504
|
DAQ: __loop_center. previous method for loop centre, started to add different logic depdnign on whetehr it was the first iteration.
|
2025-09-11 14:49:36 +02:00 |
|
|
leonarski_f
|
71587a584d
|
DAQ: error handling when sample.geoemtry request fails
|
2025-09-11 14:48:02 +02:00 |
|
|
leonarski_f
|
ebd403fcf7
|
DAQ: Loop centre sequence - now using ml box to centre sample - takes centre of leftmost edge of either the face or the whole loop. Added print statements and more images saved to database.
|
2025-09-11 14:47:13 +02:00 |
|
|
leonarski_f
|
11722304b3
|
DAQ - debugging: magent sensor debugging
|
2025-09-11 14:45:10 +02:00 |
|
|
leonarski_f
|
f608b1b7b7
|
daq: loop centering sequence. strange formatting fixed.
|
2025-09-05 17:25:19 +02:00 |
|
|
leonarski_f
|
c50edebe22
|
daq: loop centering sequence. Changes how filenames oif background images are generated and saved in redis. Changes angles. Debugging print statements currently kept but can be removed following further testing.
|
2025-09-05 17:24:32 +02:00 |
|
|
leonarski_f
|
9fece3e4a1
|
daq: loop centering. Tried a coupole of methods includign a flatfield correction. Currently implemenmted absdiff with an Otsu threshold estiamtion. Needs tidying!
|
2025-09-05 17:23:00 +02:00 |
|
|
leonarski_f
|
1e5166ffba
|
daq: changes to get background. now save background for zoom and exposure settings. fixed bug where background would be taken at default sam cam settings.
|
2025-09-05 17:21:22 +02:00 |
|
|
leonarski_f
|
e94ba0a084
|
daq: changed auto loop centring angles to -45 and -90 to reduce glare from smargon
|
2025-09-05 17:17:51 +02:00 |
|
|
leonarski_f
|
125671617d
|
daq: auto loop centring and auto crystal centring error handling
|
2025-09-05 17:17:05 +02:00 |
|
|
leonarski_f
|
0fd137a160
|
daq: added screenshot before raster
|
2025-09-03 10:16:54 +02:00 |
|
|
leonarski_f
|
bd9a24bc17
|
DAQ: additional error handling for magnet controller status failure
|
2025-09-02 17:23:22 +02:00 |
|
|
leonarski_f
|
471f853663
|
DAQ: changed error handling so if rotation scan only happens if ALC succeeds and otherwise continues to next sample
|
2025-09-02 16:44:45 +02:00 |
|
|
leonarski_f
|
44059ac8fd
|
DAQ: Reenable TELL after doors opened and locked
|
2025-08-25 15:38:22 +02:00 |
|