 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 |
|
|
leonarski_f
|
eaeb76bf2a
|
DAQ - MODELS: only loop centre on 1 x zoom
|
2025-09-18 10:07:57 +02:00 |
|
|
leonarski_f
|
2c15b42454
|
TELL: Reduce polling rate from 100 Hz to 5 Hz + increase timeout on mount
|
2025-09-15 09:59:03 +02:00 |
|
|
leonarski_f
|
8e64047b0a
|
AareDAQ: Improved fix for mounted sample position error
|
2025-09-15 08:53:50 +02:00 |
|
|
leonarski_f
|
7ee95747b8
|
AareGUI: Use files with the viewer
|
2025-09-14 11:50:11 +02:00 |
|
|
leonarski_f
|
8950435daa
|
AAREDB: auto crystal centering failed event submission added
|
2025-09-11 14:54:20 +02:00 |
|
|
leonarski_f
|
206bfcf2db
|
SCRIPTS - added script to look at images offline to improve setttings for alc
|
2025-09-11 14:53:33 +02:00 |
|
|
leonarski_f
|
5f94ccd9d2
|
DAQ - MLBOX: adapting logic in MLBOX predictions now looks at multiple classes: face, crystal loop and pin.
|
2025-09-11 14:52:21 +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
|
3acf26cec7
|
DAQ/GUI - debugging: added print statments with time.ctime calls to make locating where and when errors occur easier. This is a tempoary measure until we implement logging.
|
2025-09-11 14:43:49 +02:00 |
|
|
leonarski_f
|
7d2cdeca68
|
DAQ/GUI - JFJoch: fixed bug where image viewer wasnt taking the path, by changing to the http address
|
2025-09-11 14:42:15 +02:00 |
|
|
leonarski_f
|
23ff756769
|
DAQ/GUI - JFJoch: updated to jfjoch client rc73, added functionality to get profile radius, removed functionality for mosasicty.
|
2025-09-11 14:41:29 +02:00 |
|
|
leonarski_f
|
b0c97634d5
|
Daq - models: changed default gain value for user zoom settings at 2x zoom.
|
2025-09-11 14:36:45 +02:00 |
|
|
leonarski_f
|
d507c19e79
|
Daq - models: added two zooms to auto loop centering and changed gain and exposure values.
|
2025-09-11 14:36:17 +02:00 |
|
|
leonarski_f
|
289474b56e
|
Server: fixed bug where api_status wasn't import and added http exception to status call.
|
2025-09-11 14:35:31 +02:00 |
|