mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 77 Wiki Activity
467 Commits 128 Branches 93 Tags
ReferenceToolSort
Commit Graph
260 Commits
Author SHA1 Message Date
leonarski_f 49823f54a9 AAREDB: WIP changes to ingest RASTER grid scan into DB 2025-09-19 16:19:40 +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 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 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 8950435daa AAREDB: auto crystal centering failed event submission added 2025-09-11 14:54:20 +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 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 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 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
leonarski_f ead75f8d29 aaredb: added alc_failed event message 2025-09-03 10:16:33 +02:00
leonarski_f f7166a6619 Tell Client: added X as an allowed position (reference puck) 2025-09-02 17:23:59 +02:00
leonarski_f bd9a24bc17 DAQ: additional error handling for magnet controller status failure 2025-09-02 17:23:22 +02:00
leonarski_f 471f853663 DAQ: changed error handling so if rotation scan only happens if ALC succeeds and otherwise continues to next sample 2025-09-02 16:44:45 +02:00
leonarski_f 44059ac8fd DAQ: Reenable TELL after doors opened and locked 2025-08-25 15:38:22 +02:00
GotthardG d47ce8be84 Introduce DataCollectionParameters model with validation and update dependencies
Build and Publish / build (push) Successful in 24s
Details 
Added a new `DataCollectionParameters` model in `aaredaqlib` with extensive field validation and default handling for increased robustness. Updated `aaredaqlib`, `aaredb`, and related dependencies to version `0.2.4` for consistency across modules. Enhanced logging for better visibility during validation.
 2025-08-20 15:13:05 +02:00
leonarski_f 2452d47475 DAQ: For vertical grid scan in auto centering, use a smaller y step. 2025-08-13 09:19:12 +02:00
leonarski_f efa8e611f9 DAQ: Changed exposure time in auto_center raster grid request from 0.05 to 0.01 2025-08-13 09:16:39 +02:00
leonarski_f 1afdb5851b DAQ: added any(img.spots > 0) and a backgroudn thershold check to identify crystall raster. 2025-08-13 09:15:44 +02:00
leonarski_f 092cf6593f DAQ: removed auto from automated data collection filename (user request) 2025-07-21 10:09:19 +02:00
leonarski_f abab0aac10 DAQ: Added further complexity to identify_crystal_raster. Looking at the number of spots indexed, and if multiple images with this value, selects the median image number 2025-07-17 14:27:19 +02:00
leonarski_f 8146184fad DAQ: Changed zoom settings before auto_center in measure, and added a random hex string to the sample_prefix to prevent data overwrite 2025-07-17 14:27:19 +02:00
leonarski_f c73ac8d880 DAQ: error handling for loop centering. Following loop centering change to higher zoom for ML box 2025-07-17 14:27:19 +02:00
leonarski_f c50dd0f047 DAQ: fixed bug where ml box screenshots where not sent correctly to the db 2025-07-17 14:27:19 +02:00
leonarski_f 7d33785563 DAQ: send sample failed event to the database during automatic data collection if something fails. 2025-07-17 14:27:19 +02:00
leonarski_f afbd07a79d DAQ: added aaredb events to send an error message event to the db 2025-07-17 14:27:19 +02:00
GotthardG 14c8780616 Refactor WebSocket handling and remove redundant functions 
Improved error handling for WebSocket connections by wrapping `ws.run_forever()` in a try-except block. Simplified `tellupdater` by removing unused functions (`convert_pucks` and `pucks_equal`) and ensuring consistent puck state updates. Enhanced logging for better traceability during WebSocket operations.
 2025-07-16 16:56:38 +02:00
leonarski_f 09be1864a5 GUI: Run viewer to check online X-ray images 2025-07-16 16:49:46 +02:00