Commit Graph

  • 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
  • 504c640bf9 Dose calculation should not be 0 when sample unmounted. Now uses transmission appleb_m 2025-11-06 10:00:42 +01:00
  • 64053bdeec DAQ; raster defaults for automation updated appleb_m 2025-11-06 10:00:19 +01:00
  • 827743d89f GUI:updated default raster settings appleb_m 2025-11-06 09:43:48 +01:00
  • 05ce9ccd98 DAQ: updated default rotation settngs appleb_m 2025-11-06 09:40:21 +01:00
  • 5085477cf4 DAQ: updated default camera exposure settings for 6D appleb_m 2025-11-06 09:40:07 +01:00
  • 5376809685 GUI: scan_settings now uses new default fucnitons from number ine edits ParseSampleParamsFromDB appleb_m 2025-11-05 15:18:53 +01:00
  • 52e25fd3d6 GUI: added defaults to numberlineedits and fixed a typo appleb_m 2025-11-05 15:18:30 +01:00
  • 83496f6e22 GUI: changed which camera view is visible during mounting appleb_m 2025-11-05 15:17:59 +01:00
  • c727e93c76 GUI: fixed bug in face detection panel where you couldnt see the labels for the number ine edit boces appleb_m 2025-11-05 15:17:27 +01:00
  • 9e4e6a3180 DAQ: added a function to set parameters during automation between smart parameters, spreadsheeta dn defaults martinappleby 2025-11-05 14:34:08 +01:00
  • 98d7e0bac3 DAQ: tidied up models for SimpleScanparameters and added optional filename for future work martinappleby 2025-11-05 14:33:12 +01:00
  • 190858e1fc DAQ: added a function to get parameters from the database for a given sample martinappleby 2025-11-05 14:21:44 +01:00
  • a08ea4bc5d GUI: "safety" added to parameters panels so they cannot be updated unless you re in control of teh GUI appleb_m 2025-11-05 13:36:19 +01:00
  • 10f881e0cf GUI: fixed bug where the line edits were not updated in the GUI when reloading parameters appleb_m 2025-11-05 13:35:47 +01:00
  • 3afd05ee3b GUI: added a force_update-function to number_line_edit.py appleb_m 2025-11-05 13:34:55 +01:00
  • 93fa4b5bd4 Merge remote-tracking branch 'origin/ParseSampleParamsFromDB' into ParseSampleParamsFromDB martinappleby 2025-11-05 11:02:59 +01:00
  • 0df121f03c COMMON: logger no longer looks for hardcoded yaml, but looks for a yaml in the format f"logging_{env}.yaml" where env is an environement varaible tos et the yaml to dev or prod and the path is dependnet on the logger_config file path. martinappleby 2025-11-05 10:59:53 +01:00
  • 612241999a GUI: raster updates from spreadsheet for now but maybe shouldn't martinappleby 2025-11-05 10:58:34 +01:00
  • 82c7355065 GUI: refactored rotation_data_collection.py panel to use data from scan_settings_panel martinappleby 2025-11-05 10:57:14 +01:00
  • cccf629618 GUI: reload_parameters, reload_parameters button and update_data-collection_parameters is now "owned" by scan_settings_panel.py martinappleby 2025-11-05 10:56:47 +01:00
  • 9f140dc08b GUI: rotation_data_collection.py fixedbug where self.sample was initialised not self._sample, if sample is None return to default parameters or if aaredb_params is None/doesn't exist. Also correct transmisison from percentage to decimal appleb_m 2025-11-04 15:09:44 +01:00
  • 1c3cfab2d8 GUI: update rotation_panel data collection parameters from database martinappleby 2025-11-04 13:48:46 +01:00
  • d61a94b48b DAQ: updated pyproject.toml to latest version of aaredb martinappleby 2025-11-04 11:35:40 +01:00
  • d86f6c5f32 GUI: main_window.py added second axis camera to views. WIP appleb_m 2025-11-03 16:27:44 +01:00
  • b12d60e27e DAQ: mlbox.py updated to mx-ml stream appleb_m 2025-11-03 16:27:22 +01:00
  • 6b23509445 GUI:" tell_sample_panel.py added filters to sample spreadsheet appleb_m 2025-11-03 16:27:05 +01:00
  • 8ef53955d4 GUI: status bad - upated avaialbe pgroups for staff to be all appleb_m 2025-11-03 16:26:47 +01:00
  • 3185df5d40 DAQ: added all p group request appleb_m 2025-11-03 16:26:06 +01:00
  • da821a5e3d GUI: daq_worker.py added handle all prgroups request for staff members appleb_m 2025-11-03 16:25:50 +01:00
  • 82a478925a aareDB: added resolution to detector_data appleb_m 2025-11-03 16:25:19 +01:00
  • 482fac3431 DAQ: updated status so that DAQ status is masked by user level. WIP leonarski_f 2025-10-31 16:41:05 +01:00
  • 2d5f0160c6 DAQ: added logging to server.py leonarski_f 2025-10-31 16:40:00 +01:00
  • 70ccb4256f GUI: pgroup is now a combo box, or can be typed and has a completer. currently limited to user pgroups leonarski_f 2025-10-31 16:37:05 +01:00
  • 288712cfbb GUI: daq_worker - if identical message from handle_status_response only emit after _auth_error_min_interval has passed leonarski_f 2025-10-31 16:36:32 +01:00
  • 7dcafe1288 DAQ: fix bug where if target None we get an error leonarski_f 2025-10-31 16:35:30 +01:00
  • e2d8c524d7 GUI: added logging to smart panel, only rewrite smart params when they change leonarski_f 2025-10-31 16:34:26 +01:00
  • 3f805b0dd9 GUI: added logging to smart panel, only rewrite smart params when they change leonarski_f 2025-10-31 16:34:18 +01:00
  • 380bcb773e GUI: status_bar now ahs logic depending on current user and state of beamline leonarski_f 2025-10-31 16:33:07 +01:00
  • bb59e3fe96 DAQ: added face dtecetion correction in Y leonarski_f 2025-10-30 16:57:38 +01:00
  • a570b40225 GUI: updated logger in daq worker leonarski_f 2025-10-30 16:57:14 +01:00
  • 839468453c GUI: updated logger leonarski_f 2025-10-30 16:56:54 +01:00
  • 5260078db5 COMMON: updated logger_config.py to include a test and to log to connect the correct logger leonarski_f 2025-10-30 16:56:40 +01:00
  • 76ff311f94 GUI: added log_panel leonarski_f 2025-10-30 16:56:10 +01:00
  • 0deb44a227 GUI: main_window.py updated logging and hid settings from non staff users leonarski_f 2025-10-30 16:55:59 +01:00
  • 9285013229 GUI: changed message from session other to Guest Mode leonarski_f 2025-10-30 11:14:10 +01:00
  • 6d3c11fbd5 GUI: added message if session state is vacant or other leonarski_f 2025-10-30 11:10:34 +01:00
  • 4c8414cee9 GUI: main_window.py - added logdock from logpanel and enabled logging leonarski_f 2025-10-30 11:05:02 +01:00
  • 9a91942223 COMMON: added logging to camera_image.py leonarski_f 2025-10-30 11:04:06 +01:00
  • cbe049a8e9 COMMON: logger_config.py, added QT log handling to enable a logging panel in the GUI leonarski_f 2025-10-30 11:02:19 +01:00
  • 3d35413fcd GUI: logging added to gui.py leonarski_f 2025-10-30 11:01:49 +01:00
  • 3755511660 GUI: logging added to face detection panel leonarski_f 2025-10-30 11:01:17 +01:00
  • 3e8a25f0a5 GUI: logging addded to daq_worker.py, change frequency of occurence of Host requires authentication error leonarski_f 2025-10-30 11:00:40 +01:00
  • ac0e65d7b8 GUI: logging error in auth leonarski_f 2025-10-30 10:57:51 +01:00
  • 160e026709 GUI: logging beeamline state from status bar leonarski_f 2025-10-30 10:57:26 +01:00
  • 243ade20de GUI: face detection panel is no longer visible on start up leonarski_f 2025-10-29 15:08:20 +01:00
  • f1d5f88e02 GUI: removed unnecessary api_base_url and token trasnfer to face detection panel leonarski_f 2025-10-29 15:03:17 +01:00
  • 55b6a1b821 GUI: changed aesthetics in FaceDetectionPanel leonarski_f 2025-10-29 14:59:03 +01:00
  • d8bc6feeef AAREDB: added send_msg_to_db function - needs testing leonarski_f 2025-10-29 14:58:39 +01:00
  • 9adf90a203 aaredb: ADDED LOGGER leonarski_f 2025-10-29 14:58:10 +01:00
  • 7d4dd0ebf5 DAQ: ALC failed message, if objects are detected send to server which objects were detected and how many times leonarski_f 2025-10-29 13:54:41 +01:00
  • ecf6bf0dac DAQ: updated ALC to use updated mlbox.py and to give more information to the DB leonarski_f 2025-10-29 13:38:12 +01:00
  • 9f2d8dce21 LOGGER: update config leonarski_f 2025-10-29 13:36:59 +01:00
  • 48ff0d1274 TELL: get event from Tell when going to dry or if gripper detects no sample and then handle it correctly in the DAQ. Added protection to get_mounted_sample if repsonse is None or if fails to decode response leonarski_f 2025-10-29 13:36:20 +01:00
  • 26c18de825 DAQ/GUI: updated face_detection.py, refactored mlbox.py to use pydantic models and to allow more functionality to be added to the analysis of the boxes leonarski_f 2025-10-29 13:34:09 +01:00
  • 0a59b41644 Tell: check gripper state (only want to check for failure but needs more testing first) leonarski_f 2025-10-27 17:03:38 +01:00
  • f7f5a7aa1f Tell: added error hadnling and check_smart_magent_mounted class leonarski_f 2025-10-27 17:03:05 +01:00
  • 7eb838fd17 DAQ: added logging in sample and removed a check that was surpresssing errors and leading to incorrect information. This section needs to be checked leonarski_f 2025-10-27 16:58:15 +01:00
  • 89bf7cd36f DAQ: added check in mount to see if sample is mounted. may not be needed if tell work is successful leonarski_f 2025-10-27 16:56:35 +01:00
  • 7de48e2b8f DAQ: added back tell check motion enable and wait mount complete leonarski_f 2025-10-27 16:56:00 +01:00
  • 79e736055d AAREDB: updated event functions. WIP: combine into one function! leonarski_f 2025-10-27 16:52:28 +01:00
  • e1f353f611 DAQ: temporarily added timing log statements to evaluate how long steps take during automation leonarski_f 2025-10-24 17:34:34 +02:00
  • 68fafa6b4e MlBOX: added logging statment to MLBOX to debug time leonarski_f 2025-10-24 17:33:51 +02:00
  • 8893a109dd TELL: added check for drying if samples are loaded from dewer leonarski_f 2025-10-24 17:33:22 +02:00
  • 7594b208d5 GUI: updated labels in smart_rotation_panel.py leonarski_f 2025-10-24 17:33:01 +02:00
  • 6bef211af0 DAQ: connected daq and GUI face detection panel leonarski_f 2025-10-24 17:32:40 +02:00
  • 87aed7a2ad GUI: added face_detection_panel.py leonarski_f 2025-10-24 17:32:21 +02:00
  • 883d04e7cd daq: removed print statement from devices.py leonarski_f 2025-10-24 17:31:49 +02:00
  • 28f7369a86 GUI: added face_detection hadnling to daq_worker.py leonarski_f 2025-10-24 17:31:21 +02:00
  • d658fe4336 DAQ: updated face detection code and included more logging statements leonarski_f 2025-10-24 17:30:54 +02:00
  • d83fedc7cd TELL: added custom logger to tell_client.py leonarski_f 2025-10-23 14:21:03 +02:00
  • eebcb3d82c PSHELL: updated pshell_client.py should add pshell as a python module instead leonarski_f 2025-10-23 14:09:58 +02:00
  • 4c054006c0 DAQ: changed print statements to log statements in mount() leonarski_f 2025-10-23 14:08:16 +02:00
  • 3c5b193fcc DAQ: workflows.py updated rse2sa - need to test after long park if still operational leonarski_f 2025-10-21 16:49:48 +02:00
  • 41687a4902 DAQ: bug fix after raster where smargon tried to nudge with None, None. leonarski_f 2025-10-21 16:49:21 +02:00
  • 08eb442561 DB: correclty multiple beamsize by 1000 instead of 100 for raster and rotation leonarski_f 2025-10-21 15:33:01 +02:00
  • 7a49de2530 DAQ: removed move to cold when in park leonarski_f 2025-10-21 12:39:42 +02:00
  • 0f35b559be DAQ: changed default log location to local. leonarski_f 2025-10-21 12:39:30 +02:00
  • aa1d39f9b0 COMMON: logger_config.py fixed bug where config yaml was ignored leonarski_f 2025-10-21 12:38:36 +02:00
  • d3ab570b54 MLBOX: updated model to v8_20102025 leonarski_f 2025-10-21 12:38:10 +02:00
  • 5334d6c2c3 WORKFLOWS: removed manual move to cold in rse2sa and from dh2sa leonarski_f 2025-10-21 12:37:46 +02:00
  • a58f1c5d80 WORKFLOWS: removed manual move to cold in rse2sa and from dh2sa leonarski_f 2025-10-21 12:37:41 +02:00
  • 6be02cc1cd WORKFLOWS: added logging leonarski_f 2025-10-21 12:37:04 +02:00
  • b00bebe0ab DAQ: if no sample, sample name called unknown_sample to allow debugging rotation and raster scans leonarski_f 2025-10-20 17:29:51 +02:00