Commit Graph

  • 191365dab4 GUI: added message boxes that check the hutch shutter and the beam current appleb_m 2025-11-25 17:59:25 +01:00
  • e72f30db23 DAQ/GUI: pyproject to 0.2.63 0.2.63 leonarski_f 2025-11-25 16:20:01 +01:00
  • 49369927b3 DAQ/GUI: correctly setup logger in files. leonarski_f 2025-11-25 14:52:54 +01:00
  • 53e941f4e4 DAQ/GUI: update to version 0.2.62 - changed how raster scan works so always relative to top left corner of grid. This is then corrected in the appropriate places and has been updated in the visualiser leonarski_f 2025-11-25 14:46:39 +01:00
  • 3f8f51d74a Model: added two macros to models for puck and positionm, currently legacy macros sgpuck and sgposition are kept. leonarski_f 2025-11-25 09:13:54 +01:00
  • 6d191c87bf GUI: file path protection for run numbers based on data collection type leonarski_f 2025-11-25 09:12:42 +01:00
  • 60e8b223f3 Find_crystal: add new filter for 30% max spots. leonarski_f 2025-11-25 09:12:13 +01:00
  • f60fee1976 Find_crystal: fix bug in quality filter and add new filter for 30% max spots. leonarski_f 2025-11-25 09:11:58 +01:00
  • fb8307cce0 DAQ: set raster grid start position correctly, do not filter below low res spots of 10, and add corner_coord bool leonarski_f 2025-11-25 09:08:25 +01:00
  • a45aae8372 GUI: camera_image.py change colour of beam marker based on shutter status leonarski_f 2025-11-25 09:06:58 +01:00
  • 73c8f1e3be GUI: remove deep copy of raster grid due to recursive copy error leonarski_f 2025-11-25 09:06:05 +01:00
  • 63a0c519e3 GUI: rotation_data_collection.py and rast_grid added total measurement time and file path protection leonarski_f 2025-11-25 09:05:20 +01:00
  • 9a733ddfb0 GUI: ring_current protection for automation leonarski_f 2025-11-25 09:02:21 +01:00
  • caab2573df GUI: add MIN_DTZ to panel and set minimum dtz in scan settings panel to 108 leonarski_f 2025-11-25 09:01:21 +01:00
  • f40edbb918 GUI: set minimum dtz in scan settings panel to 108 leonarski_f 2025-11-25 08:59:19 +01:00
  • c730ec456d Daq: update version to 0.2.61 0.2.62 appleb_m 2025-11-21 11:07:46 +01:00
  • f310d56533 Common: update version to 0.2.61 appleb_m 2025-11-21 11:07:37 +01:00
  • 1427e6d71f Common: change default value for directory appleb_m 2025-11-21 11:06:56 +01:00
  • 8ce63334e9 GUI: fixed bug where default was spots but said was low res spots 0.2.61 appleb_m 2025-11-20 09:56:28 +01:00
  • 241e94db19 DAQ: vERICAL RASTER NOW USES 25% BEAM AS SIZE FOR VERTICAL STEP appleb_m 2025-11-20 09:29:31 +01:00
  • 8a0a6ed092 GUI: update simple panel to correctly send paramerters during automation and to intiailise vA appleb_m 2025-11-20 09:27:20 +01:00
  • 19858b8fe5 GUI: fixed bug where directory was incorrectly called in get parameter mappings appleb_m 2025-11-20 09:26:46 +01:00
  • 096e8297ed COMMON: models - added SImpleScanParameters and SimpleStrategyInputModel appleb_m 2025-11-20 09:26:24 +01:00
  • b2dbb4c286 DAQ: MlBox.py added debug statements when errors occur and fixed bug in check_box_relation and box_relation appleb_m 2025-11-20 09:26:01 +01:00
  • c0d4a61176 GUI: relink ML predicitions appleb_m 2025-11-20 09:24:39 +01:00
  • a4ebe9fded DAQ: COM added debug statement, crystal_size logs crystal size and quality condition filter now uses max low res spots to create a threshold of 30% - currently hardcoded appleb_m 2025-11-20 09:24:28 +01:00
  • 41c50e64c5 DAQ: identify_crystal_raster - no longer uses indexed spots, always uses low res spots and now moves 0.5 so that it centres on a square not the corner appleb_m 2025-11-20 09:23:11 +01:00
  • c9509f50e9 GUI: file_path_panel takes directory from spreadhseet if there is one otherwise previous default logic applies appleb_m 2025-11-20 09:22:22 +01:00
  • 8a3e3f4c76 DAQ: remove superfluous print statements in hutch shutter appleb_m 2025-11-20 09:21:53 +01:00
  • 257a9a9127 DAQ: remove comment in tidyup appleb_m 2025-11-20 09:21:32 +01:00
  • a96d2d67d0 DAQ: error message if unknown box class found appleb_m 2025-11-20 09:21:15 +01:00
  • f26b3a9c9b DAQ: added ingest gridscan, reflector up for normal requested raster and axc failure message added appleb_m 2025-11-20 09:20:57 +01:00
  • 9f248d84a4 DAQ: if no sample detected bhy gripper go to dry appleb_m 2025-11-20 09:20:09 +01:00
  • 264d939ea3 DAQ: bug in spreadsheetparams where file_prefix wasnt propogated when no other spreadsheet params given appleb_m 2025-11-20 09:19:47 +01:00
  • ff8741b68e DAQ: Updated daq status to use config appleb_m 2025-11-20 09:19:18 +01:00
  • c0cde06b8e DAQ: Updated spreadsheet and automation params appleb_m 2025-11-20 09:18:31 +01:00
  • bdfaf31c93 DAQ: Changes to automation and debugging statements improved in alc appleb_m 2025-11-20 09:17:11 +01:00
  • 1acb69e5f2 DAQ: added new properties to redis including crystal size, b_factor and automation_parameters appleb_m 2025-11-20 09:09:53 +01:00
  • b40b30c13d DAQ: added new properties to redis including crystal size, b_factor and automation_parameters appleb_m 2025-11-20 09:09:45 +01:00
  • 22d21dcb6d DAQ: tempoarily bring up reflector for data collection appleb_m 2025-11-18 17:50:27 +01:00
  • e7b4d12f58 DAQ-find_xtal.py error messages appleb_m 2025-11-18 17:38:29 +01:00
  • 760a499ce5 DAQ- WIP automation manager stuff master-unstable appleb_m 2025-11-18 17:36:51 +01:00
  • 70a47cf7e9 Merge branch 'master' into master-unstable appleb_m 2025-11-18 16:55:46 +01:00
  • 192e290a67 Update pyproject.toml for aaredaq to 0.2.6 0.2.6 appleb_m 2025-11-18 16:52:46 +01:00
  • fc9b430de6 Update pyproject.toml for aaredaq appleb_m 2025-11-18 16:51:23 +01:00
  • 033d7f7a0c GUI: WIP - effort to make FSM for automation appleb_m 2025-11-18 16:50:48 +01:00
  • 01238bdc22 DAQ: effort to mvoe smart_data_Collection_strategy to daq - WIP appleb_m 2025-11-18 16:50:30 +01:00
  • d70b3fe3e5 GUI: sample_queue_panel.py automation update to FSM WIP appleb_m 2025-11-18 16:49:53 +01:00
  • 94a4f16e0b DAQ: add a pause between raster scans in automation too take screenshot. Probably jsut need to move reflector in and out. appleb_m 2025-11-18 16:30:29 +01:00
  • af8a715f70 DAQ: now use config/redis to save smart_params and better choose when to use smart_params. filename connected for automation appleb_m 2025-11-18 16:29:53 +01:00
  • b0b48638ff server: smart_params now stored in redis appleb_m 2025-11-18 16:28:34 +01:00
  • cf55c447d4 models.py: updated simplestrategyinputmodel paramters appleb_m 2025-11-18 16:27:52 +01:00
  • 67ed636295 DAQ: removed unnecessary print statements from hutch shutter appleb_m 2025-11-18 16:27:28 +01:00
  • 3ea61bf28d CONFIG - added crystal_size, last_best_res, last_best_b-Factor, Auto_params and simple))input_params to config.py appleb_m 2025-11-18 16:26:53 +01:00
  • 3a193413e0 GUI: added energy - unconnected - to smart params martinappleby 2025-11-18 14:26:11 +01:00
  • 32b6dd397a Common: updated simplescanparameters and added in input martinappleby 2025-11-18 14:25:42 +01:00
  • ebc01b540c Merge branch 'refs/heads/master' into master-unstable martinappleby 2025-11-18 13:42:39 +01:00
  • e5bcd95f13 DAQ: added experiemtn hutch shutter to status bar appleb_m 2025-11-18 13:38:32 +01:00
  • d94860be39 DAQ: added error message to log when daq status fails appleb_m 2025-11-18 13:35:06 +01:00
  • e587f87c91 DAQ: added experiment hutch shutter to daq status model in models.py appleb_m 2025-11-18 13:33:43 +01:00
  • 6f53847492 DAQ: added experiment hutch shutter to daq so it can be closed in an emergency appleb_m 2025-11-18 13:33:11 +01:00
  • 086b9f6cab Merge branch 'master' into master-unstable martinappleby 2025-11-17 13:20:53 +01:00
  • a96d2fa1ab DAQ: jfjoch_viewer.py change name to path in print statement during load appleb_m 2025-11-17 13:11:11 +01:00
  • a8446f5909 GUI: reference tool unmount button bug fix (again). Right click unmount also works! appleb_m 2025-11-17 13:09:22 +01:00
  • 38e3e81147 GUI: unmount button fix martinappleby 2025-11-17 11:58:38 +01:00
  • c0164645a9 DAQ: Save Fluorescence for rotation scan leonarski_f 2025-11-13 11:42:52 +01:00
  • b3502e722a GUI: Fluorescence further improvements leonarski_f 2025-11-13 11:31:29 +01:00
  • d321d219a3 GUI: Fluorescence improvements leonarski_f 2025-11-13 10:56:33 +01:00
  • 5ca8ad9f64 GUI: Fluorescence split between panel and plot leonarski_f 2025-11-13 10:40:12 +01:00
  • 4833b06829 DAQ - Fluorescence spectrum allows to set transmission + energy is set correctly leonarski_f 2025-11-13 10:19:04 +01:00
  • 2fffeef0cf DAQ/GUI - Fluorescence spectrum in a single call leonarski_f 2025-11-13 09:01:05 +01:00
  • 2021cf8cf0 DAQ/GUI - debug statements to check mlbox prediciton streamadn revert to usign mx-aare-test until mx-ml issue resolved. ReferenceToolSort appleb_m 2025-11-12 08:46:14 +01:00
  • 49068b4431 Loger - change default location for gui but not daq appleb_m 2025-11-12 08:45:27 +01:00
  • cc48f8683b GUI: problem with x-ml ip, currently one is hardcoded - needs fixing asap appleb_m 2025-11-12 08:44:30 +01:00
  • 7e280b597d GUI: fixed typo in many logging statements in daq_worker.py appleb_m 2025-11-12 08:43:55 +01:00
  • 0ed47e7d4a DAQ/GUI: feature added - fluorimeter panel and device appleb_m 2025-11-11 11:43:31 +01:00
  • 209b0a279b DAQ: attempted fix to save raw data in /raw/data and chjange start omega in automation appleb_m 2025-11-11 11:42:43 +01:00
  • e5db4a7419 DAQ: attempted fix to set spreadsheet_params to None so simple params will be used appleb_m 2025-11-11 11:35:18 +01:00
  • 3ba6009b7b DAQ: added a check to see if curp or target_pos is Nonem as they are set to None when abr crashes appleb_m 2025-11-11 11:34:34 +01:00
  • 3f0e6873ea GUI: Fixed bug where start_angle wouldn't update to current value appleb_m 2025-11-11 11:33:59 +01:00
  • 070a26c53d GUI: Attempted fix to prevent skip of first sample, skip was inconsistent so may need lots of runs to confirm it does not happen appleb_m 2025-11-10 10:56:31 +01:00
  • 74430d213f GUI: Spot count (low res) is now the first option in raster_data_collection.py appleb_m 2025-11-10 10:55:25 +01:00
  • 7fb870eac4 GUI: Fixed sorting for mount count in reference_tools_panel.py and also the unmoutn button is now correctly wired appleb_m 2025-11-10 09:42:48 +01:00
  • 22790b7b87 Merge branch 'master' into ReferenceToolSort appleb_m 2025-11-10 09:11:21 +01:00
  • fab7d95a22 DAQ: fix to handle automated raster parameters martinappleby 2025-11-07 14:07:58 +01:00
  • 9f0bc6e076 GUI: added error handling if GUI fails to open. Will need to test to see if it crashes if any other errors are raised! martinappleby 2025-11-07 14:07:32 +01:00
  • 02ad6269c6 GUI: fixed bug where reference_tools_panel.py would infinite loop due to refactoring of self._rows to self._samples martinappleby 2025-11-07 14:02:17 +01:00
  • f6228dad5a GUI: added more verbose error handling to JFJochDbusClient martinappleby 2025-11-07 14:01:45 +01:00
  • 39322cde80 GUI: block signal in numberlineedit when update-value or force_update-value is called martinappleby 2025-11-07 14:00:57 +01:00
  • 36f8fa9d58 GUI: bug fix, if sample is None default values are no longer enforced by the GUI, user can edit values again. appleb_m 2025-11-07 11:16:33 +01:00
  • f95f92264e DAQ: bug fix where res could be None but now is compared correctly. appleb_m 2025-11-07 11:06:59 +01:00
  • f3b798b770 GUI: limit pgroup typing to only valid pgroups martinappleby 2025-11-06 15:58:30 +01:00
  • 337b59af39 GUI: attempt to make filters in the tell sample panel dependent on the other active filters martinappleby 2025-11-06 15:53:22 +01:00
  • 90a8f3f9b8 GUI: unmount button buf hopefully fixed by removing sampleshortinfo from signal martinappleby 2025-11-06 15:48:07 +01:00
  • 056f166b93 GUI: attempt at fixing the sorting function in refernce tools martinappleby 2025-11-06 15:46:17 +01:00
  • bbaf12c9d5 DAQ: add some logic to automation parameters for raster. appleb_m 2025-11-06 14:05:55 +01:00
  • e72f37d7ab DAQ: Update dtz between raster and rotation. Wired transmission from params to scans. Added more verbose debug statements to automation. appleb_m 2025-11-06 13:49:03 +01:00
  • f071ad6a88 DAQ: Update dtz between raster and rotation. Wired transmission from params to scans. Added more verbose debug statements to automation. appleb_m 2025-11-06 13:48:41 +01:00
  • 9d19c2c961 DAQ: correctly format logger appleb_m 2025-11-06 13:47:02 +01:00
  • 45e96b4a33 GUI: removed irrelevant logging from scan settings panel appleb_m 2025-11-06 10:01:10 +01:00