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 |
|
appleb_m
|
fd58fbc07a
|
Changelog has unreleased section
|
2025-12-10 13:40:31 +01:00 |
|
appleb_m
|
0d3c83144d
|
Updated changelog to 0.2.67
|
2025-12-10 13:39:25 +01:00 |
|
appleb_m
|
3ce4865b40
|
Merge branch 'master' into CheckedLineEdit
|
2025-12-10 13:35:39 +01:00 |
|
appleb_m
|
77feb00b71
|
GUI/DAQ_WORKER: added sample_missing signal that triggers if sample is missing.
|
2025-12-10 13:33:59 +01:00 |
|
appleb_m
|
fadf069129
|
GUI/DAQ_WORKER: added sample_missing signal that triggers if sample is missing.
|
2025-12-10 13:33:55 +01:00 |
|
appleb_m
|
a4a2e568de
|
GUI/DAQ_WORKER: added sample_missing signal that triggers if sample is missing.
|
2025-12-10 13:32:54 +01:00 |
|
appleb_m
|
79694798db
|
DAQ/CONFIG: added failed mount count, plus logic to DAQ.
|
2025-12-10 13:32:14 +01:00 |
|
appleb_m
|
ee2f9a4789
|
DAQ: class added for critical Tell Failure and a warning exception for TELL errors
|
2025-12-10 13:28:49 +01:00 |
|
appleb_m
|
4196a1e468
|
DAQ: added error handling for mount exceptions in server.py.
|
2025-12-10 13:27:49 +01:00 |
|
appleb_m
|
2180412179
|
DAQ: authenticate for super users added
|
2025-12-10 13:23:50 +01:00 |
|
appleb_m
|
22a64cd6a3
|
GUI: bug in creating manual sample where run number couldn't be -1. May need fixing later.!
|
2025-12-10 13:20:05 +01:00 |
|
appleb_m
|
dab6124928
|
GUI: re-enabled MLpredicitonthread.
|
2025-12-10 13:11:52 +01:00 |
|
appleb_m
|
88c0ce3242
|
GUI: updated CheckedLineEdit to raster, rotation and scansetttings. and corrected functionaility.
|
2025-12-10 13:11:29 +01:00 |
|
GotthardG
|
864f7aa005
|
DAQ: Adding run_number into SampleShortInfo model
Build and Publish / build (push) Successful in 23s
0.2.67
|
2025-12-10 10:28:01 +01:00 |
|
appleb_m
|
d186e2d787
|
GUI: Added CheckedLineEdit to raster, rotation and scan settings
|
2025-12-09 16:13:03 +01:00 |
|
appleb_m
|
a613beec44
|
GUI: Added CheckLienEdit class
|
2025-12-09 16:09:59 +01:00 |
|
leonarski_f
|
5f71f7730d
|
GUI: Default fluorescence file name contains sample name
|
2025-12-05 11:29:16 +01:00 |
|
leonarski_f
|
2f95d522f0
|
GUI: Save fluorescence scan as CSV
|
2025-12-05 11:17:33 +01:00 |
|
appleb_m
|
49ad78bc58
|
Tell: added a wait for Tell to be ready before going to dry
|
2025-12-04 11:49:56 +01:00 |
|