 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 |
|
|
appleb_m
|
1e882c5cd5
|
GUI: tidied up status_bar.py state handling.
|
2025-09-29 16:57:01 +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
|
f479eac4fb
|
AareGUI: Zoom settings for X06DA (work in progress)
|
2025-09-26 09:57:52 +02:00 |
|
|
leonarski_f
|
078e85f812
|
AareGUI: Auth based on local user
|
2025-09-26 09:57:12 +02:00 |
|
|
leonarski_f
|
72ceb80a88
|
AareDAQ: Remove extra verbose print
|
2025-09-25 19:52:24 +02:00 |
|
|
leonarski_f
|
f2ff0e04aa
|
AareGUI: Smoothen exit from GUI by adding timeout on ZeroMQ
|
2025-09-25 09:12:59 +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
|
76e4fa0bcd
|
AareGUI: Fix default addresses for services
|
2025-09-25 08:54:59 +02:00 |
|
|
leonarski_f
|
40a7ae6c5e
|
AareDAQ: Handle p-groups correctly (as a list) in the server
|
2025-09-25 08:54:37 +02:00 |
|
 Martin Appleby
|
d90d847506
|
DAQ: changed beamline busy to be constant
|
2025-09-22 11:47:34 +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
|
69b4dd6481
|
COMMON: logger_config.py added, WIP!
|
2025-09-19 16:19:12 +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
|
f857f8b8b7
|
GUI: camera_image.py added BEAMLINE BUSY message when beamline is in use. ALso change colour of the beam centre mark
|
2025-09-19 16:12:20 +02:00 |
|
|
leonarski_f
|
c5a11f049a
|
GUI: camera_thread.py update for USB-C camera.
|
2025-09-19 16:11:37 +02:00 |
|
|
leonarski_f
|
46dad594ac
|
COMMON: updated pyproject.toml jfjoch client version
|
2025-09-19 16:11:09 +02:00 |
|
|
leonarski_f
|
14cd289b55
|
GUI: status bar update from Takashi recommendations
|
2025-09-19 16:10:40 +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
|
89f8574a6d
|
GUI: updated zmq_address for OAV
|
2025-09-18 10:09:38 +02:00 |
|
|
leonarski_f
|
7e96b58b5b
|
DAQ - jfjoch_viewer.py: fixed slot bug and changed load functions to use the http address instead of file path.
|
2025-09-18 10:09:01 +02:00 |
|