Commit Graph
326 Commits
Author SHA1 Message Date
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 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
leonarski_f bb476669cc GUI: add data to filepath for rotation scan 2025-10-07 17:04:24 +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
leonarski_f 694ecf54bd GUI: updated smart_rotation_panel functionality and included more widgets in the GUI 2025-10-07 13:05:50 +02:00
leonarski_f 3a24fc2aa1 GUI: connected smart_rotation_panel.py to main_window.py and data_collection_settings.py. Updated payload and values in smart_rotation_panel.py. 2025-10-01 17:12:25 +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 99d32326a7 diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta 2025-10-01 17:04:56 +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 4f2d18fbf8 Smart rotation panel: Make it looking a bit nicer 2025-10-01 09:09:57 +02:00
leonarski_f 93453e6048 Diffraction geometry: Protect for asin out of (-1,-1) range 2025-10-01 09:09:40 +02:00
leonarski_f 7e1857f5c5 AUTOMATION PARAMETERS: simple/smart rotation panel added 2025-09-30 17:14:09 +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 2b033b551f DAQ: Fix resolution to dtz routines 2025-09-30 11:53:55 +02:00
leonarski_f 478aea06fc DAQ: Add commissioning mode 2025-09-30 11:28:21 +02:00
leonarski_f 64d7f3bfa9 GUI: Remove selected samples from the queue 2025-09-30 11:12:22 +02:00
leonarski_f b2a7cad463 GUI: Beamline busy is in a corner and irrespective of image zoom 2025-09-30 11:04:55 +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 20e9a4d5ed GUI: Show only available transitions 2025-09-30 10:26:10 +02:00
leonarski_f 41f10aef22 GUI: Staff beamline controls are not created for non-staff user 2025-09-30 09:56:42 +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 456cd63420 GUI: changed dewer load/unload to dewer transfer to match state name 2025-09-29 16:57:25 +02:00