mx/AareDAQ
0
1 Fork 0
Code Issues 27 Pull Requests Actions Packages Projects Releases 98 Wiki Activity

Commit Graph

  • 735ec7514b DAQ: removed superfluos comment appleb_m 2025-12-22 09:38:28 +01:00
  • c40fa4f56a DAQ: added logic for axcfailed statement appleb_m 2025-12-22 09:38:15 +01:00
  • bca98172a9 DAQ: added try except to ingest statements so if they fail data is still displayed in the GUI. appleb_m 2025-12-22 09:37:23 +01:00
  • 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. appleb_m 2025-12-22 09:35:24 +01:00
  • 92428ff2fa DAQ: bug where has_sufficient_low_res_spots was not imported. appleb_m 2025-12-22 09:34:24 +01:00
  • 7a9411d0cd DAQ: added class variable for the min low spots threshold appleb_m 2025-12-22 09:33:46 +01:00
  • 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. appleb_m 2025-12-22 09:33:26 +01:00
  • 7acba275ba DAQ: updated mount failure logic and error handling. appleb_m 2025-12-22 09:31:33 +01:00
  • 82ba3a4412 DAQ: added AXCFailed exception class. This needs tidyign up in Jan appleb_m 2025-12-22 09:30:49 +01:00
  • 90545a420b DAQ: robot dry and park on repeated mount failures appleb_m 2025-12-22 09:30:27 +01:00
  • 7bf97eeae3 GUI: Check beamline state before running automation. appleb_m 2025-12-18 16:34:19 +01:00
  • 29b1ee85bd GUI: Make more consistent interface to load image after rotation scan leonarski_f 2025-12-16 09:36:59 +01:00
  • 2bd3c9d242 Merge remote-tracking branch 'origin/master' 0.2.68 appleb_m 2025-12-12 14:43:08 +01:00
  • 2bb9b3dd29 Update version to 0.2.68 appleb_m 2025-12-12 14:42:33 +01:00
  • 91f1ea49e9 Update changelog.md appleb_m 2025-12-12 14:40:14 +01:00
  • 9827acf95a Update changelog.md appleb_m 2025-12-12 14:39:39 +01:00
  • ee74cdc92a DAQ: added ingest scan to rotation and screening. And fucntionality in aaredb TellSampleHandling appleb_m 2025-12-12 14:35:58 +01:00
  • 9f85c07965 models: bug where sample_id and attach_image where twice follwoign rework appleb_m 2025-12-12 14:35:10 +01:00
  • e7f394a833 GUI: dtz protection for high_res in smart_panel appleb_m 2025-12-12 14:34:40 +01:00
  • 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. appleb_m 2025-12-12 14:34:06 +01:00
  • 24f26a5d40 Models: rearranged the order in ScanResultPayloadModel to be consistent elsewhere. appleb_m 2025-12-12 14:29:32 +01:00
  • aa1f7b0a73 DAQ: added wait messages for robot to track strange behaviour appleb_m 2025-12-11 13:33:23 +01:00
  • 13cb35b2c6 GUI: fixed bug in automation where sample table wasnt updated when an error occured appleb_m 2025-12-11 13:33:03 +01:00
  • d53bb581eb GUI: changed msg in smaple_missing_dialogue-box appleb_m 2025-12-11 13:32:11 +01:00
  • 7744ad6f5a GUI: fixed error handling in daq_worker appleb_m 2025-12-11 13:31:51 +01:00
  • 6960e05815 DAQ: move_park isntead of dry. Need a park and dry fucnction appleb_m 2025-12-11 13:31:34 +01:00
  • eb66fd2f7f DAQ: don't wait for dry when failure, wait after dry when failure. Added error message to track this. appleb_m 2025-12-11 12:34:52 +01:00
  • 178b963140 Merge branch 'master' into TellSampleHandling appleb_m 2025-12-11 12:18:41 +01:00
  • 1c27820026 DAQ: bug in MotionHandler fixed (string should be mount_count) appleb_m 2025-12-11 12:18:09 +01:00
  • b4e1961a16 ScanResultPayloadModel addded appleb_m 2025-12-11 12:02:52 +01:00
  • c9b0ee2038 DAQ: Go back to start omega appleb_m 2025-12-11 10:34:33 +01:00
  • c2b8b7549b DAQ: Use server URL for image appleb_m 2025-12-11 10:27:42 +01:00
  • 2e7627dbcc DAQ: Add throttle down to raster scan appleb_m 2025-12-10 17:07:42 +01:00
  • 4347e5b846 DAQ: bug fixes in mount handling appleb_m 2025-12-10 16:49:21 +01:00
  • ec512c9a67 Merge branch 'master' into TellSampleHandling appleb_m 2025-12-10 16:05:42 +01:00
  • 116aa51fdd GUI/DAQ: changed how tell mounting errors are handled. need to be tested appleb_m 2025-12-10 16:05:36 +01:00
  • 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 appleb_m 2025-12-10 16:03:55 +01:00
  • f8fbfe9642 GUI: bug in busy overlay - removing for now appleb_m 2025-12-10 16:02:45 +01:00
  • bb94f71aa7 GUI: number_line_edit.py block signals during set_busy otherwise dtza and high_res are unchecked appleb_m 2025-12-10 15:47:54 +01:00
  • b6ebcf0dbd GUI: added busy message to gonio and beamline camera thread appleb_m 2025-12-10 14:19:25 +01:00
  • 521a488ec6 Merge branch 'master' into TellSampleHandling appleb_m 2025-12-10 14:14:16 +01:00
  • e494fac5dd GUI: added camera selection to gonio_camera_thread initialization appleb_m 2025-12-10 14:01:30 +01:00
  • 0ed2f85faa GUI: beamline view vertical not horizontal appleb_m 2025-12-10 13:42:52 +01:00
  • fd58fbc07a Changelog has unreleased section appleb_m 2025-12-10 13:40:31 +01:00
  • 0d3c83144d Updated changelog to 0.2.67 appleb_m 2025-12-10 13:39:25 +01:00
  • 3ce4865b40 Merge branch 'master' into CheckedLineEdit CheckedLineEdit appleb_m 2025-12-10 13:35:39 +01:00
  • 77feb00b71 GUI/DAQ_WORKER: added sample_missing signal that triggers if sample is missing. appleb_m 2025-12-10 13:33:59 +01:00
  • fadf069129 GUI/DAQ_WORKER: added sample_missing signal that triggers if sample is missing. appleb_m 2025-12-10 13:33:55 +01:00
  • a4a2e568de GUI/DAQ_WORKER: added sample_missing signal that triggers if sample is missing. appleb_m 2025-12-10 13:32:54 +01:00
  • 79694798db DAQ/CONFIG: added failed mount count, plus logic to DAQ. appleb_m 2025-12-10 13:32:14 +01:00
  • ee2f9a4789 DAQ: class added for critical Tell Failure and a warning exception for TELL errors appleb_m 2025-12-10 13:28:49 +01:00
  • 4196a1e468 DAQ: added error handling for mount exceptions in server.py. appleb_m 2025-12-10 13:27:49 +01:00
  • 2180412179 DAQ: authenticate for super users added appleb_m 2025-12-10 13:23:50 +01:00
  • 22a64cd6a3 GUI: bug in creating manual sample where run number couldn't be -1. May need fixing later.! appleb_m 2025-12-10 13:20:05 +01:00
  • dab6124928 GUI: re-enabled MLpredicitonthread. appleb_m 2025-12-10 13:11:52 +01:00
  • 88c0ce3242 GUI: updated CheckedLineEdit to raster, rotation and scansetttings. and corrected functionaility. appleb_m 2025-12-10 13:11:29 +01:00
  • 864f7aa005 DAQ: Adding run_number into SampleShortInfo model 0.2.67 GotthardG 2025-12-10 10:28:01 +01:00
  • d186e2d787 GUI: Added CheckedLineEdit to raster, rotation and scan settings appleb_m 2025-12-09 16:13:03 +01:00
  • a613beec44 GUI: Added CheckLienEdit class appleb_m 2025-12-09 16:09:59 +01:00
  • 5f71f7730d GUI: Default fluorescence file name contains sample name leonarski_f 2025-12-05 11:29:16 +01:00
  • 2f95d522f0 GUI: Save fluorescence scan as CSV leonarski_f 2025-12-05 11:17:33 +01:00
  • 49ad78bc58 Tell: added a wait for Tell to be ready before going to dry monday_1st_december appleb_m 2025-12-04 11:49:56 +01:00
  • dcef9673ae GUI: set smart_parameters output of flux and dose to None so that smart-paramters are not emitted continuously appleb_m 2025-12-04 11:49:28 +01:00
  • 954b288f7d GUI: reformatted total_time label on rotation, raster and smart appleb_m 2025-12-04 11:48:49 +01:00
  • 15527a3622 Smart_params: minimum time now 1.1ms before chanfgin transimsission appleb_m 2025-12-04 11:34:38 +01:00
  • 56f95a4451 GUI: raster data colelction settings updated dtz 200 mm and 0.02 exp_time appleb_m 2025-12-04 11:33:50 +01:00
  • eea628937f GUI: remove prediction thread connection appleb_m 2025-12-04 11:33:10 +01:00
  • ebde133677 Remove superfluos bec import (was ceommented out) appleb_m 2025-12-04 11:32:42 +01:00
  • 3c6630bbaa DAQ: omega check bug fix. appleb_m 2025-12-04 11:31:21 +01:00
  • 4cb6fc5745 Smart_rotation_panel - only update when changes are made - this will be moved to daq soon appleb_m 2025-12-04 11:30:56 +01:00
  • 4ca89b6ffe Server: correctly masks status in a cleaner manner appleb_m 2025-12-04 11:30:36 +01:00
  • 6633578e2c pyprojeccttoml for common updated to most recent jfjoch version appleb_m 2025-12-04 11:30:19 +01:00
  • c43e28b92e Logger_config: should now expand ~ correctly in filepath appleb_m 2025-12-04 11:29:58 +01:00
  • 366581b397 DAQ: cx and cy were flipped in get_result_list_from_com appleb_m 2025-12-04 11:29:39 +01:00
  • 0da0ebf325 aaredb: fixedbug where calling non-existent model due to versioning issues appleb_m 2025-12-04 11:29:22 +01:00
  • b96b35c6e8 Tell: dry - wait for pshell to be ready progressbar appleb_m 2025-12-04 11:06:54 +01:00
  • 5f08b5d540 Smart_params - poll less frequently appleb_m 2025-12-04 11:06:41 +01:00
  • 72c16ca0a1 Omega timeout catch added appleb_m 2025-12-04 10:52:36 +01:00
  • 7c5360beb0 Daq_worker - poling status is increased due to some error - needs debugging appleb_m 2025-12-04 10:52:20 +01:00
  • e7c21cd5d7 devices: removed superfluos print statements appleb_m 2025-12-04 10:51:30 +01:00
  • ac9d18e394 GUI: removed prediction thread string for 6D appleb_m 2025-12-04 10:51:07 +01:00
  • 8b7ab340a2 raster_grid_manager.py - changed defaults for scan to 200 mm dtz and 0.02 exp_time_s appleb_m 2025-12-04 10:50:50 +01:00
  • 09dc47ac95 GUI: smart_rotation_panel.py change calculation to update exposure time to 0.0011 s before changing transmission appleb_m 2025-12-04 10:44:10 +01:00
  • 382afcc0c0 GUI: updated formatting of total time in rotation and added to simple appleb_m 2025-12-02 15:59:12 +01:00
  • 60a36f37a8 GUI: updated formatting of total time in raster grid appleb_m 2025-12-02 15:51:36 +01:00
  • 4d4ffc6bfb GUI: added detector status check when user clicks run appleb_m 2025-12-02 15:48:36 +01:00
  • ed4d79e0fd GUI: added detector status to data colelciton panel appleb_m 2025-12-02 15:48:22 +01:00
  • a35248a97c DAQ: fix bug in how status was handled. Rather than make new model - updates full with masked data appleb_m 2025-12-02 13:37:30 +01:00
  • 5071d21462 COMMON: raster_grid.py - start updating models for ingestion - WIP appleb_m 2025-12-02 13:36:54 +01:00
  • 08b5e9ae5e DAQ: updated jfjoch_client dependency appleb_m 2025-12-02 13:36:29 +01:00
  • ce258786d0 COMMON: import brokerstatus from jfjoch appleb_m 2025-12-02 13:36:12 +01:00
  • e52c645fa1 GUI: fix bug in smart_params handling - should be mvoed to daq eventually appleb_m 2025-12-02 13:35:49 +01:00
  • efed20977e LOGGER: update file path to correctly generate directory appleb_m 2025-12-02 13:35:03 +01:00
  • df1a018084 DAQ: find_xtal.py bug where cx and cy were flipped appleb_m 2025-12-02 13:34:38 +01:00
  • 2142097ce6 DAQ/GUI: added jfjoch_status to daq for progress bar in GUI appleb_m 2025-12-02 13:34:23 +01:00
  • 4d068a49f9 DAQ: exception if fails to read auto_params appleb_m 2025-12-02 13:32:18 +01:00
  • 6633aa5680 DAQ: ingest script for screening - WIP appleb_m 2025-12-02 13:31:18 +01:00
  • 12bb65e1bd DAQ: Move aerotech to mount psotion when going to manual mount appleb_m 2025-11-28 17:09:03 +01:00
  • a0d7a805ec Viewer: calls file rather than from online stream appleb_m 2025-11-28 17:07:18 +01:00
  • 3629f2ebd8 jfjoch client: added function co call api to get diffraction image appleb_m 2025-11-28 17:06:15 +01:00