Commit Graph
631 Commits
Author SHA1 Message Date
appleb_m ff652ec5ed Update VERSION to 0.2.69
Build and Publish / build (push) Successful in 25s
0.2.69
2025-12-22 13:54:53 +01:00
appleb_m 3c81d02814 Tell: logger.debug stateements to see waht wait_ready does. Seems to not work. keeping for now until we fix. 2025-12-22 13:53:03 +01:00
appleb_m 10d378f0d1 Tell: logger.debug stateements to see waht wait_ready does. Seems to not work. keeping for now until we fix. 2025-12-22 09:42:47 +01:00
appleb_m 51e309a2aa GUI: check beamline state when you start data collection in raster 2025-12-22 09:41:07 +01:00
appleb_m 1fa421c5cf DAQ: added has_sufficient_low_res_spots function but forgot to commit it - sorry! 2025-12-22 09:40:15 +01:00
appleb_m 0796572cb8 DAQ: bug where find_xtal was using spot_count not low_res_spots for the initial check. 2025-12-22 09:39:48 +01:00
appleb_m bbc409eb81 GUI: upped status polling to 500ms due to potential network issues. 2025-12-22 09:39:13 +01:00
appleb_m 735ec7514b DAQ: removed superfluos comment 2025-12-22 09:38:28 +01:00
appleb_m c40fa4f56a DAQ: added logic for axcfailed statement 2025-12-22 09:38:15 +01:00
appleb_m bca98172a9 DAQ: added try except to ingest statements so if they fail data is still displayed in the GUI. 2025-12-22 09:37:23 +01:00
appleb_m 300e719167 DAQ: moved wait_ready() earlier to see if this resolves a robot timing issue with the gripper. The different wait comamnds ahve simialr logic but seem to break. Needs exploring in the new year. 2025-12-22 09:35:24 +01:00
appleb_m 92428ff2fa DAQ: bug where has_sufficient_low_res_spots was not imported. 2025-12-22 09:34:24 +01:00
appleb_m 7a9411d0cd DAQ: added class variable for the min low spots threshold 2025-12-22 09:33:46 +01:00
appleb_m 2a54ee43d3 DAQ: added error handling for raster if spots less than a thresh-hold. Currently commented as it affects manual users, should only be used in automation. 2025-12-22 09:33:26 +01:00
appleb_m 7acba275ba DAQ: updated mount failure logic and error handling. 2025-12-22 09:31:33 +01:00
appleb_m 82ba3a4412 DAQ: added AXCFailed exception class. This needs tidyign up in Jan 2025-12-22 09:30:49 +01:00
appleb_m 90545a420b DAQ: robot dry and park on repeated mount failures 2025-12-22 09:30:27 +01:00
appleb_m 7bf97eeae3 GUI: Check beamline state before running automation. 2025-12-18 16:34:19 +01:00
leonarski_f 29b1ee85bd GUI: Make more consistent interface to load image after rotation scan 2025-12-16 09:36:59 +01:00
appleb_m 2bd3c9d242 Merge remote-tracking branch 'origin/master'
Build and Publish / build (push) Successful in 26s
0.2.68
2025-12-12 14:43:08 +01:00
appleb_m 2bb9b3dd29 Update version to 0.2.68 2025-12-12 14:42:33 +01:00
appleb_m 91f1ea49e9 Update changelog.md 2025-12-12 14:40:14 +01:00
appleb_m 9827acf95a Update changelog.md 2025-12-12 14:39:39 +01:00
appleb_m ee74cdc92a DAQ: added ingest scan to rotation and screening. And fucntionality in aaredb 2025-12-12 14:35:58 +01:00
appleb_m 9f85c07965 models: bug where sample_id and attach_image where twice follwoign rework 2025-12-12 14:35:10 +01:00
appleb_m e7f394a833 GUI: dtz protection for high_res in smart_panel 2025-12-12 14:34:40 +01:00
appleb_m 593854282f GUI: added an additional fudge factor to the smart_calc so that it extends further for high_res, but ahs miniaml effect on low. 2025-12-12 14:34:06 +01:00
appleb_m 24f26a5d40 Models: rearranged the order in ScanResultPayloadModel to be consistent elsewhere. 2025-12-12 14:29:32 +01:00
appleb_m aa1f7b0a73 DAQ: added wait messages for robot to track strange behaviour 2025-12-11 13:33:23 +01:00
appleb_m 13cb35b2c6 GUI: fixed bug in automation where sample table wasnt updated when an error occured 2025-12-11 13:33:03 +01:00
appleb_m d53bb581eb GUI: changed msg in smaple_missing_dialogue-box 2025-12-11 13:32:11 +01:00
appleb_m 7744ad6f5a GUI: fixed error handling in daq_worker 2025-12-11 13:31:51 +01:00
appleb_m 6960e05815 DAQ: move_park isntead of dry. Need a park and dry fucnction 2025-12-11 13:31:34 +01:00
appleb_m eb66fd2f7f DAQ: don't wait for dry when failure, wait after dry when failure.
Added error message to track this.
2025-12-11 12:34:52 +01:00
appleb_m 178b963140 Merge branch 'master' into TellSampleHandling 2025-12-11 12:18:41 +01:00
appleb_m 1c27820026 DAQ: bug in MotionHandler fixed (string should be mount_count) 2025-12-11 12:18:09 +01:00
appleb_m b4e1961a16 ScanResultPayloadModel addded 2025-12-11 12:02:52 +01:00
appleb_m c9b0ee2038 DAQ: Go back to start omega 2025-12-11 10:34:33 +01:00
appleb_m c2b8b7549b DAQ: Use server URL for image 2025-12-11 10:27:42 +01:00
appleb_m 2e7627dbcc DAQ: Add throttle down to raster scan 2025-12-10 17:07:42 +01:00
appleb_m 4347e5b846 DAQ: bug fixes in mount handling 2025-12-10 16:49:21 +01:00
appleb_m ec512c9a67 Merge branch 'master' into TellSampleHandling 2025-12-10 16:05:42 +01:00
appleb_m 116aa51fdd GUI/DAQ: changed how tell mounting errors are handled. need to be tested 2025-12-10 16:05:36 +01:00
appleb_m fdd6b192ce GUI: changed from force to update valuye fopr high_res_enter when the spreadsheet is updated. Force_update_value for checkedlineedit always updates external but doesnt force cahnge to editor unless the box is unchecked 2025-12-10 16:03:55 +01:00
appleb_m f8fbfe9642 GUI: bug in busy overlay - removing for now 2025-12-10 16:02:45 +01:00
appleb_m bb94f71aa7 GUI: number_line_edit.py block signals during set_busy otherwise dtza and high_res are unchecked 2025-12-10 15:47:54 +01:00
appleb_m b6ebcf0dbd GUI: added busy message to gonio and beamline camera thread 2025-12-10 14:19:25 +01:00
appleb_m 521a488ec6 Merge branch 'master' into TellSampleHandling 2025-12-10 14:14:16 +01:00
appleb_m e494fac5dd GUI: added camera selection to gonio_camera_thread initialization 2025-12-10 14:01:30 +01:00
appleb_m 0ed2f85faa GUI: beamline view vertical not horizontal 2025-12-10 13:42:52 +01:00