173c4ea304
Workflows: tempoarily remove reflector and close detector cover to improve ML
leonarski_f2025-10-16 13:00:36 +02:00
834e180067
GUI: reverted to previous comit due to missing changes in smart_rotation_panel.py needs testing with data collection
leonarski_f2025-10-16 13:00:11 +02:00
aabd435c6f
DAQ: Implementation of reference-tools get methods from redis GUI: Adding reference tools panel with mount and unmount functions
GotthardG2025-10-15 15:18:29 +02:00
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
leonarski_f2025-10-07 13:16:02 +02:00
8cf7cb01ca
DAQ: reset crystalsize b_facror and best_res when loading a new sample
leonarski_f2025-10-07 13:14:01 +02:00
5f10bbf077
DAQ: import crystalsize from models.py
leonarski_f2025-10-07 13:13:11 +02:00
acca3d27a1
DAQ: added crystal_size b_factor and best_res to daq_status
leonarski_f2025-10-07 13:12:30 +02:00
312eebc9c1
DAQ: added crystalsize model and added b_factor and crystal_size to models.py
leonarski_f2025-10-07 13:07:00 +02:00
694ecf54bd
GUI: updated smart_rotation_panel functionality and included more widgets in the GUI
leonarski_f2025-10-07 13:05:50 +02:00
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.
leonarski_f2025-10-01 17:12:25 +02:00
34b614a166
DAQ: added last_best_res to daq status
leonarski_f2025-10-01 17:11:29 +02:00
e4db694c39
DAQ: and models.py - added last_best_res calculation and value to daq and models
leonarski_f2025-10-01 17:11:06 +02:00
19d5740c1f
diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta
leonarski_f2025-10-01 17:06:43 +02:00
99d32326a7
diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta
leonarski_f2025-10-01 17:04:56 +02:00
ee626f83c2
diffraction_geometry: added poni_rot1_rad and poi_rot2_rad
leonarski_f2025-10-01 17:04:25 +02:00
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.
leonarski_f2025-09-30 15:44:07 +02:00
b8b3e1b900
DAQ: config.py fixed bug in bl_zoom_settings which was requesting user zoom settings not bl_zoom_settings
leonarski_f2025-09-30 13:29:05 +02:00
b20609089c
DAQ: Authentication for staff operations checks if session is active for the user
leonarski_f2025-09-30 09:21:49 +02:00
81404facde
DAQ: zoom in BL state, work in progress
leonarski_f2025-09-30 09:18:57 +02:00
a901745da4
DAQ: workflows.py change to sa2bln to get samcam_settings from bl_zoom_settings
appleb_m2025-09-29 17:04:39 +02:00
456cd63420
GUI: changed dewer load/unload to dewer transfer to match state name
appleb_m2025-09-29 16:57:25 +02:00
1e882c5cd5
GUI: tidied up status_bar.py state handling.
appleb_m2025-09-29 16:57:01 +02:00
941936eb3b
DAQ: devices.py: more verbose print statement in samcam_settings
appleb_m2025-09-29 11:57:28 +02:00
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?
appleb_m2025-09-29 11:54:19 +02:00
f479eac4fb
AareGUI: Zoom settings for X06DA (work in progress)
leonarski_f2025-09-26 09:57:52 +02:00
dd310accfd
DAQ: when __set_state is called check to see if beamline is busy otherwise raise an exception
leonarski_f2025-09-19 16:18:35 +02:00
688c635be7
DAQ: temporarily disabled ALC when manually mounting - should be an option in the GUI to enable/disable
leonarski_f2025-09-19 16:17:05 +02:00
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
leonarski_f2025-09-19 16:16:22 +02:00
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!
leonarski_f2025-09-19 16:14:06 +02:00
f857f8b8b7
GUI: camera_image.py added BEAMLINE BUSY message when beamline is in use. ALso change colour of the beam centre mark
leonarski_f2025-09-19 16:12:20 +02:00
c5a11f049a
GUI: camera_thread.py update for USB-C camera.
leonarski_f2025-09-19 16:11:37 +02:00
46dad594ac
COMMON: updated pyproject.toml jfjoch client version
leonarski_f2025-09-19 16:11:09 +02:00
14cd289b55
GUI: status bar update from Takashi recommendations
leonarski_f2025-09-19 16:10:40 +02:00
7e02c537eb
DAQ - ALC: added error message to database when ALC fails for manual sample collection
leonarski_f2025-09-18 10:11:49 +02:00
77d81c182e
DAQ: attempted fix of sample_geometry bug to handle error when the ABR disconnects.
leonarski_f2025-09-18 10:11:10 +02:00
7e96b58b5b
DAQ - jfjoch_viewer.py: fixed slot bug and changed load functions to use the http address instead of file path.
leonarski_f2025-09-18 10:09:01 +02:00
eaeb76bf2a
DAQ - MODELS: only loop centre on 1 x zoom
leonarski_f2025-09-18 10:07:57 +02:00
2c15b42454
TELL: Reduce polling rate from 100 Hz to 5 Hz + increase timeout on mount
leonarski_f2025-09-15 09:59:03 +02:00
8e64047b0a
AareDAQ: Improved fix for mounted sample position error
leonarski_f2025-09-15 08:53:50 +02:00
leonarski_f
GotthardG
appleb_m