206bfcf2db
SCRIPTS - added script to look at images offline to improve setttings for alc
leonarski_f2025-09-11 14:53:33 +02:00
5f94ccd9d2
DAQ - MLBOX: adapting logic in MLBOX predictions now looks at multiple classes: face, crystal loop and pin.
leonarski_f2025-09-11 14:52:21 +02:00
6f7dbdede9
DAQ: measure - changes zoom back to 1 before changing sample
leonarski_f2025-09-11 14:51:21 +02:00
b9b32769ca
DAQ: __loop_center_sequence: now uses ml_loop_centre_box. If it does not find a target moves on
leonarski_f2025-09-11 14:50:51 +02:00
6394554334
DAQ: __loop_center. bug fix, added iteration to function parameters
leonarski_f2025-09-11 14:49:59 +02:00
88d36f8504
DAQ: __loop_center. previous method for loop centre, started to add different logic depdnign on whetehr it was the first iteration.
leonarski_f2025-09-11 14:49:36 +02:00
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.
leonarski_f2025-09-11 14:47:13 +02:00
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.
leonarski_f2025-09-11 14:43:49 +02:00
7d2cdeca68
DAQ/GUI - JFJoch: fixed bug where image viewer wasnt taking the path, by changing to the http address
leonarski_f2025-09-11 14:42:15 +02:00
23ff756769
DAQ/GUI - JFJoch: updated to jfjoch client rc73, added functionality to get profile radius, removed functionality for mosasicty.
leonarski_f2025-09-11 14:41:29 +02:00
b0c97634d5
Daq - models: changed default gain value for user zoom settings at 2x zoom.
leonarski_f2025-09-11 14:36:45 +02:00
d507c19e79
Daq - models: added two zooms to auto loop centering and changed gain and exposure values.
leonarski_f2025-09-11 14:36:17 +02:00
289474b56e
Server: fixed bug where api_status wasn't import and added http exception to status call.
leonarski_f2025-09-11 14:35:31 +02:00
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.
leonarski_f2025-09-05 17:24:32 +02:00
9fece3e4a1
daq: loop centering. Tried a coupole of methods includign a flatfield correction. Currently implemenmted absdiff with an Otsu threshold estiamtion. Needs tidying!
leonarski_f2025-09-05 17:23:00 +02:00
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.
leonarski_f2025-09-05 17:21:22 +02:00
e94ba0a084
daq: changed auto loop centring angles to -45 and -90 to reduce glare from smargon
leonarski_f2025-09-05 17:17:51 +02:00
125671617d
daq: auto loop centring and auto crystal centring error handling
leonarski_f2025-09-05 17:17:05 +02:00
7d6c3a63b0
workflows: added detector cover to workflows
leonarski_f2025-09-05 17:14:34 +02:00
0fd137a160
daq: added screenshot before raster
leonarski_f2025-09-03 10:16:54 +02:00
f7166a6619
Tell Client: added X as an allowed position (reference puck)
leonarski_f2025-09-02 17:23:59 +02:00
bd9a24bc17
DAQ: additional error handling for magnet controller status failure
leonarski_f2025-09-02 17:23:22 +02:00
471f853663
DAQ: changed error handling so if rotation scan only happens if ALC succeeds and otherwise continues to next sample
leonarski_f2025-09-02 16:44:45 +02:00
44059ac8fd
DAQ: Reenable TELL after doors opened and locked
leonarski_f2025-08-25 15:38:22 +02:00
a9321888c6
Removed logger usage and redundant debug messages from models.py.
leonarski_f2025-08-20 15:25:26 +02:00
d47ce8be84
Introduce DataCollectionParameters model with validation and update dependencies
0.2.4
GotthardG2025-08-20 15:13:05 +02:00
80a473806d
Updated aareDB dependency to version 0.1.1a22 in pyproject.toml.
leonarski_f2025-08-20 13:11:32 +02:00
2452d47475
DAQ: For vertical grid scan in auto centering, use a smaller y step.
leonarski_f2025-08-13 09:19:12 +02:00
efa8e611f9
DAQ: Changed exposure time in auto_center raster grid request from 0.05 to 0.01
leonarski_f2025-08-13 09:16:39 +02:00
1afdb5851b
DAQ: added any(img.spots > 0) and a backgroudn thershold check to identify crystall raster.
leonarski_f2025-08-13 09:15:44 +02:00
2c0a08f0c1
DAQ: updated gain value for loop centring to current value used.
leonarski_f2025-08-13 09:14:37 +02:00
05fe41ae93
DAQ: fixed bug in Image-_number function> ALso checks if image_angle is 0 to prevent a divide by 0 error.
leonarski_f2025-07-22 17:07:12 +02:00
174881d160
DAQ: fixed bug where order of samples dropped into the queue would occasioanlly be arbitrary.
leonarski_f2025-07-21 15:55:29 +02:00
092cf6593f
DAQ: removed auto from automated data collection filename (user request)
leonarski_f2025-07-21 10:09:19 +02:00
3eebdef584
DAQ: increased exposure time slightly for loop centering
leonarski_f2025-07-18 10:27:23 +02:00
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
leonarski_f2025-07-17 14:23:40 +02:00
8146184fad
DAQ: Changed zoom settings before auto_center in measure, and added a random hex string to the sample_prefix to prevent data overwrite
leonarski_f2025-07-17 14:22:42 +02:00
c73ac8d880
DAQ: error handling for loop centering. Following loop centering change to higher zoom for ML box
leonarski_f2025-07-17 11:43:07 +02:00
c50dd0f047
DAQ: fixed bug where ml box screenshots where not sent correctly to the db
leonarski_f2025-07-17 11:42:39 +02:00
7d33785563
DAQ: send sample failed event to the database during automatic data collection if something fails.
leonarski_f2025-07-17 11:42:18 +02:00
afbd07a79d
DAQ: added aaredb events to send an error message event to the db
leonarski_f2025-07-17 11:41:32 +02:00
cac3b67dde
DAQ: Always add "raster/" for rasters (remove {type} in GUI)
leonarski_f2025-07-14 11:31:49 +02:00
de4b94bc93
DAQ: Always add "raster/" for rasters
leonarski_f2025-07-14 11:11:56 +02:00
1468a1211c
DAQ: tries to create ml_bounding_box, if it fails moves to 90 degrees and updates file_prefix.
leonarski_f2025-07-14 10:36:28 +02:00
344190831b
DAQ: updated grid_request parameters in __auto_center
leonarski_f2025-07-14 10:35:52 +02:00
75cc75b10e
DAQ: fixed bug in identify_crystal_raster where if filtered_images is none, none was given to max(). Now checks for this and uses all images if filtered_images is None
leonarski_f2025-07-14 10:33:45 +02:00
d672ce8780
GUI: Tweak defaults for ABR step and rotation/screening
leonarski_f2025-07-14 10:21:34 +02:00
dd6d429e8d
DAQ: Check to see if sample exists and has a sample ID before trying to submit a screenshot to the database
leonarski_f2025-07-10 13:25:00 +02:00
88e639b070
DAQ: Switch to raster panel from rotation panel if change is made to the drawn grid
leonarski_f2025-07-10 13:23:25 +02:00
0fcdd13c5a
DAQ: always check proper file is open in the viewer
leonarski_f2025-07-10 13:01:28 +02:00
61287028ac
DAQ: cryo at 50.0 for beam location
leonarski_f2025-07-10 13:01:03 +02:00
007fbd356b
DAQ: use wait=False just to be sure
leonarski_f2025-07-10 13:00:47 +02:00
8b9dcd8cef
Update dependencies and enhance WebSocket processing
GotthardG2025-07-11 21:23:01 +02:00
edbdab6625
GUI: Add spot ice ratio to the drop down panel and grid scan result visualisation. Fixed bug where spot count (ice) wasn't being correctly parsed to the GUI.
leonarski_f2025-07-09 17:15:20 +02:00
4ea0b7fbcd
DAQ: Updated identify_crystal_raster to filter images based on a ratio of ice spots to low res spots as well as if an image is indexed. Added tempoary logic to correctly calculate image grid positon.
leonarski_f2025-07-09 17:14:10 +02:00
6f7945175b
Common: Increase jfjoch_client to rc.61
leonarski_f2025-07-08 13:18:53 +02:00
35249295e1
DAQ: automatically move to an optimal data collection point following a grid scan. Bug fix in _draw_grid to check if values[pxl] is None.
leonarski_f2025-07-08 11:50:57 +02:00
6fb53e9bbd
DAQ: change exposure and gain based of off zoom. Interpolates gain and exposure if zoom value is not in redis.
leonarski_f2025-07-07 11:36:04 +02:00
7c03965302
GUI: if left_click_event occurs outside of camera image area, no longer moves smargon.
leonarski_f2025-07-07 09:57:00 +02:00
6a7c84ec66
DAQ: fixed potential bug where current_sample.db_id was always sent during auto loop centering.
leonarski_f2025-07-07 09:51:33 +02:00
43cd75d3a9
DAQ: now sends sample collected to the db after jfjoch has finished writing
leonarski_f2025-07-04 17:40:05 +02:00
02b83b0096
DAQ: Now uploads screenshots to aaredb following loop centering and rotation data collection. Removed a zoom setting. Updated mount procedure to include loop centering following robot mount.
leonarski_f2025-07-04 16:23:29 +02:00
6bc3ed2eae
DAQ: sample setter now clears manual sample. removed sample_clear. Manual sample must still be unmounted by hand.
leonarski_f2025-07-04 11:59:36 +02:00
4324a814de
DAQ: Omega vector is (-1,0,0) in NeXus coordinate system - for AutoProc
leonarski_f2025-07-04 11:53:56 +02:00
leonarski_f
GotthardG