 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 |
|
 GotthardG
|
f724e7e69e
|
Adding prediction zmq and drawing in camera image
|
2025-09-23 09:41:47 +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 |
|
|
leonarski_f
|
dd462d0acd
|
GUI: added back 1x zoom button
|
2025-09-11 14:34:18 +02:00 |
|
|
leonarski_f
|
d07b8247ae
|
config: fixed strange foramtting
|
2025-09-05 17:26:59 +02:00 |
|
|
leonarski_f
|
b715cfa9d4
|
config: updated alc_bkg script to look at redis for bkg at a specific zoom exposure and gain
|
2025-09-05 17:26:38 +02:00 |
|
|
leonarski_f
|
754dd214bd
|
devices: detector cover PV added
|
2025-09-05 17:25:42 +02:00 |
|
|
leonarski_f
|
f608b1b7b7
|
daq: loop centering sequence. strange formatting fixed.
|
2025-09-05 17:25:19 +02:00 |
|
|
leonarski_f
|
c50edebe22
|
daq: loop centering sequence. Changes how filenames oif background images are generated and saved in redis. Changes angles. Debugging print statements currently kept but can be removed following further testing.
|
2025-09-05 17:24:32 +02:00 |
|
|
leonarski_f
|
9fece3e4a1
|
daq: loop centering. Tried a coupole of methods includign a flatfield correction. Currently implemenmted absdiff with an Otsu threshold estiamtion. Needs tidying!
|
2025-09-05 17:23:00 +02:00 |
|
|
leonarski_f
|
1e5166ffba
|
daq: changes to get background. now save background for zoom and exposure settings. fixed bug where background would be taken at default sam cam settings.
|
2025-09-05 17:21:22 +02:00 |
|
|
leonarski_f
|
e94ba0a084
|
daq: changed auto loop centring angles to -45 and -90 to reduce glare from smargon
|
2025-09-05 17:17:51 +02:00 |
|
|
leonarski_f
|
125671617d
|
daq: auto loop centring and auto crystal centring error handling
|
2025-09-05 17:17:05 +02:00 |
|
|
leonarski_f
|
7d6c3a63b0
|
workflows: added detector cover to workflows
|
2025-09-05 17:14:34 +02:00 |
|
|
leonarski_f
|
0fd137a160
|
daq: added screenshot before raster
|
2025-09-03 10:16:54 +02:00 |
|