Commit Graph
260 Commits
Author SHA1 Message Date
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 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 c3e454a504 Prediction (WIP) 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 ae7b538072 DAQ/GUI: mount uses refernce tools if reference=True otherwise uses sample spreadsheet 2025-10-16 12:40:55 +02:00
leonarski_f 4cd7c865f7 GUI: updates to reference_tools_panel.py WIP 2025-10-16 11:05:36 +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 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