Commit Graph

Select branches

Hide Pull Requests

CheckedLineEdit

ParseSampleParamsFromDB

ReferenceToolSort

TellSampleHandling

apache-auth

beamcenter_fit

chore/add_uv_dep

chore/better_gitignore

ci/lock_in_ci

daq_raster_predicition

docs/redo_docs

docs/update_cs

end_operation_after_error

feat/1d_beam_center

feat/add_beam_steering_routine

feat/add_phi_chi_to_jfjoch_metadata

feat/add_pxiii_flux

feat/beam_centre_from_det

feat/beam_centre_from_det_2

feat/busy_state_lock

feat/cached_status

feat/display_path_env

feat/integrate_fluo

feat/lazy_jfj

feat/release_workflow

feat/select_meitians_gridscan_analysis

feat/server_about

feat/setup_around_beam_steering

feat/smart-rotation-dose-strategy

feat/update_transmission

feat/user-gui-optimizations

feature/beam-marker-daq

find_crystal_from_gridscan

fix/aaregui-zmq

fix/actually_truncate_dtz

fix/add_automation_logging

fix/add_more_debug_to_aarescan

fix/add_x06da_bec_macros

fix/automation_errors

fix/automation_jfjoch_aarescan_failures

fix/baton-message-box

fix/beam_center_structure

fix/beamline_debugging_260827

fix/change_gap_with_energy

fix/clear_last_grid_res

fix/crash_on_no_bec

fix/detector_tilt

fix/dont_unmount_on_park_and_dry

fix/errors_from_transmission_update

fix/exception_typo

fix/floor_chi_for_jfjoch

fix/general_fixes

fix/gui_startup

fix/handle_no_ring_current

fix/improve-overwrite-error-message

fix/init_shutdown

fix/live_tests

fix/logging_improvements

fix/moving_state

fix/new_macro_signatures

fix/no_none_operation

fix/param_calculation

fix/pitch_scan_message

fix/pxii_commissioning_260820

fix/read_state_on_startup

fix/reduce_inner_workers

fix/remove_disabled_current_log

fix/remove_logs

fix/remove_pvs

fix/reverted_import

fix/save_bs_positions

fix/save_coll_positions

fix/scan-panel-user-values

fix/screening_request

fix/screening_validation

fix/spreadsheetupdate_config

fix/suppress_baton_error

fix/transmission-set-condition

fix/unmount_sample_at_end_of_automation

fix/update_deps

fix/update_uvicorn_dep

fix/updated_10s_macros

fix/use_bec_client_detz_values

fix/validate_detector_speed

fix/workflow_fetch_auth

fix/workflow_fetch_auth_2

fix/xraycenter_linescan_y

fix/zoom_before_xraycenter

gitea-pages

gui_default_parameters

improve_wording

live_260708

live_260709

live_260710

live_260713

live_260715

main

master-unstable

ml_zoom

monday_1st_december

new-gui-redesign

operation_standardisation

perl_d-patch-1

prediction

progressbar

pxiii-live-changes

raster_score

refactor/remove_direct_pvs

refactor/use_aarecommon

reference-tools

show-busy-when-changing-energy

style/cosmetics

tellupdater

update-10s-energy-range

x10sa

x10sa-tutorial

zoom_manager

#1

#100

#101

#102

#103

#104

#111

#112

#114

#115

#116

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#130

#132

#134

#135

#136

#138

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#150

#151

#152

#153

#156

#158

#159

#160

#161

#162

#164

#165

#166

#168

#169

#170

#171

#172

#176

#177

#179

#180

#181

#184

#185

#186

#187

#188

#189

#190

#191

#192

#193

#194

#195

#197

#198

#199

#200

#201

#202

#204

#205

#206

#207

#208

#209

#210

#211

#212

#213

#214

#215

#216

#217

#218

#29

#48

#49

#80

#87

#88

#89

#91

#92

#93

#94

#95

#96

#97

#98

#99

0.2.1

0.2.2

0.2.3

0.2.4

0.2.6

0.2.61

0.2.62

0.2.63

0.2.64

0.2.65

0.2.66

0.2.67

0.2.68

0.2.69

0.3.0

0.3.1

0.3.2

0.3.3

v0.10.0

v0.11.0

v0.12.0

v0.12.1

v0.12.2

v0.12.3

v0.12.4

v0.12.5

v0.13.0

v0.13.1

v0.13.2

v0.13.3

v0.13.4

v0.13.5

v0.14.0

v0.15.0

v0.16.0

v0.17.0

v0.17.1

v0.17.2

v0.17.3

v0.17.4

v0.17.5

v0.18.0

v0.19.0

v0.19.1

v0.19.2

v0.19.3

v0.19.4

v0.19.5

v0.20.0

v0.21.0

v0.21.1

v0.21.2

v0.21.3

v0.22.0

v0.22.1

v0.23.0

v0.23.1

v0.24.0

v0.24.1

v0.24.2

v0.24.3

v0.24.4

v0.24.5

v0.24.6

v0.25.0

v0.26.0

v0.27.0

v0.28.0

v0.28.1

v0.29.0

v0.29.1

v0.30.0

v0.30.1

v0.4.0

v0.5.0

v0.5.1

v0.5.2

v0.6.0

v0.6.1

v0.7.0

v0.7.1

v0.7.2

v0.7.3

v0.8.0

v0.8.1

v0.8.2

v0.8.3

v0.9.0

Mono Color

• 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
• f96bdf53b6 DAQ: submit diffraction image to database appleb_m 2025-11-28 17:05:03 +01:00
• 0c435202d0 Beamline: checks beamline env for RHEL9. Backwards compatible with RHEL8 appleb_m 2025-11-28 16:59:36 +01:00
• 1a313d4da5 Aaredb - add function to uplaod diffraction image appleb_m 2025-11-28 16:50:37 +01:00
• 5f95e63c9d Add changelog.md 0.2.66 appleb_m 2025-11-27 13:11:21 +01:00
• 445b51d9bf Update VERSION appleb_m 2025-11-27 13:08:22 +01:00
• d584409b0d Update toml to 0.2.66 appleb_m 2025-11-27 13:02:58 +01:00
• 04bae45c8c daq: bug/typo shoud be maximage.nx not .n_x appleb_m 2025-11-27 13:02:20 +01:00
• 675f5a7d18 GUI: logging in rastergridmanager for debugging appleb_m 2025-11-27 13:02:04 +01:00
• b9d86bad90 toml update to 0.2.65 appleb_m 2025-11-27 12:55:27 +01:00
• 7f0d06637d DAQ: bug fixes in new implementation of raster ingest, plus send COM too GUI for JFJoch viewer 0.2.65 appleb_m 2025-11-27 12:54:21 +01:00
• e8b03539dd DAQ/: bug fixes in new implementation 0.2.64 appleb_m 2025-11-27 12:31:45 +01:00
• d30729f655 DAQ/AAREDB: update how raster messages are sent to the db - now include COM, max_iamge number, beam_size and beamLocation. appleb_m 2025-11-27 12:20:09 +01:00
• 19e569dc81 GUI: increase total range high limit to 9999.0 appleb_m 2025-11-27 12:19:39 +01:00
• 6de9b5b89d DAQ: added new TELL exceptions appleb_m 2025-11-26 15:38:58 +01:00
• 4647a56c02 DAQ: add back in reflector down at end of raster scan, should move to beginning of raster fucntion or in auto. appleb_m 2025-11-26 15:38:39 +01:00
• 29dba9dd31 GUI: added check before colelction on all run buttons appleb_m 2025-11-25 18:02:52 +01:00
• 79c974d447 GUI: hide-reference toosl if not staff =- probably should hdie the panel appleb_m 2025-11-25 18:02:02 +01:00
• fca29699a6 GUI: more explciit error messages appleb_m 2025-11-25 18:01:38 +01:00
• 6f5701e700 find_Xtal - COM calculation bug fix appleb_m 2025-11-25 18:01:22 +01:00
• bd84f2368f daq:added http error handling for automation appleb_m 2025-11-25 18:01:07 +01:00
• 04cf0447ef auth: was using incorrect logger appleb_m 2025-11-25 18:00:04 +01:00
• ca022505f2 daq: calcualte start_pxl correctly appleb_m 2025-11-25 17:59:53 +01:00