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/default_params_per_beamline

feat/display_path_env

feat/integrate_fluo

feat/lazy_jfj

feat/release_workflow

feat/select_meitians_gridscan_analysis

feat/server_about

feat/server_side_queue

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/resolution_selection_logic

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

style/fix_lint

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

#219

#220

#221

#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.31.0

v0.31.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

• 731efccc2b DAQ: added ml_bounding_box to loop centering, creates grid scan grid using ml. Fixed bug where filename wouldn't iterate for copied grid scans. leonarski_f 2025-07-04 10:59:42 +02:00
• 804d18db4d DAQ: fixed bug where mark beam worked in sample alignment and not beam location leonarski_f 2025-07-03 15:49:33 +02:00
• 99305a473e DAQ: Added CryojetSettings as a seperate model in config and implemented in DAQ. leonarski_f 2025-07-03 14:15:05 +02:00
• 053daa24ff GUI: On new sample set data collection tab to raster leonarski_f 2025-06-30 22:37:36 +02:00
• b6a91aa952 GUI: Fix rotation/screening titles and dose vertical alignment leonarski_f 2025-06-30 14:46:46 +02:00
• 0c347783b7 GUI: Fix menu not loading in beam location mode leonarski_f 2025-06-30 14:44:30 +02:00
• a3d937fb07 GUI: Fix logic to update grid scan size leonarski_f 2025-06-30 14:41:35 +02:00
• 9f29f3036f DAQ: Align raster vertical scan leonarski_f 2025-06-30 11:57:26 +02:00
• 98499e8af8 DAQ: Fix collimator position leonarski_f 2025-06-30 11:56:13 +02:00
• 606f1b62fb GUI: Add completed grid scan table leonarski_f 2025-06-29 12:19:47 +02:00
• 518e3df0d6 GUI: Grid scan WIP leonarski_f 2025-06-29 11:18:13 +02:00
• a05222d543 DAQ: Reset zoom after mount leonarski_f 2025-06-27 20:35:55 +02:00
• 043a5eef45 GUI: Manual sample panel (WIP) leonarski_f 2025-06-29 11:10:50 +02:00
• b1c4feaee2 VERSION: 0.2.3 0.2.3 leonarski_f 2025-06-26 13:48:21 +02:00
• 27a00597ca VERSION: 0.2.2 0.2.2 leonarski_f 2025-06-26 13:45:57 +02:00
• fd7a7adaab RELEASE: 0.2.1 0.2.1 leonarski_f 2025-06-26 13:32:36 +02:00
• b27d28b6a1 DAQ+GUI: Work in progress leonarski_f 2025-06-26 12:12:36 +02:00
• 1d9c8133c1 DAQ+GUI: Work in progress leonarski_f 2025-06-26 12:12:36 +02:00
• 467d754a4f DAQ: Fix lamp light being overwritten + handle transmission being None leonarski_f 2025-06-26 09:43:07 +02:00
• f88ce1e422 GUI: Minor fix leonarski_f 2025-06-25 16:55:37 +02:00
• 5024963eba Add method to insert manual samples into the database GotthardG 2025-06-25 17:38:53 +02:00
• 2cca9c52eb Add method to insert manual samples into the database GotthardG 2025-06-25 17:37:44 +02:00
• a3cc9f29a7 Add method to insert manual samples into the database GotthardG 2025-06-25 17:37:17 +02:00
• 59539f80d4 DAQ: Beam location, work in progress leonarski_f 2025-06-25 15:12:29 +02:00
• d5887363ef Update WebSocket URL and improve data handling/debugging GotthardG 2025-06-25 14:40:38 +02:00
• 5b9169f2cf Removed test.ipynb from git tracking leonarski_f 2025-06-25 13:36:35 +02:00
• 5f6e09102f DAQ: SSE work in progress leonarski_f 2025-06-25 13:35:30 +02:00
• 33b242eca6 DAQ: Add beam location leonarski_f 2025-06-25 12:25:06 +02:00
• a1a5ad2ec1 Implement WebSocket-based spreadsheet updater with Redis caching GotthardG 2025-06-25 11:41:56 +02:00
• 2efaa4dd88 DAQ: Add spreadsheetupdater.py leonarski_f 2025-06-25 11:26:10 +02:00
• 1c2a08ac16 GUI: Open file after rotation finished leonarski_f 2025-06-25 11:25:48 +02:00
• f7734b4355 BeamlineConfig: Store spreadsheet leonarski_f 2025-06-25 10:57:33 +02:00
• 2513f0530a GUI: Show dose leonarski_f 2025-06-25 10:29:08 +02:00
• 8ec6c04c05 DAQ: Show flux leonarski_f 2025-06-25 10:04:51 +02:00
• 77cf881c8c VERSION 0.2.0 leonarski_f 2025-06-24 16:31:24 +02:00
• 7e0a006668 GUI/DAQ: Integrate sample mounting logic and improve file path management leonarski_f 2025-06-24 13:40:39 +02:00
• d0c777decd Refactor SSE listener and improve logging for TELL updates GotthardG 2025-06-24 13:08:08 +02:00
• f14e652edd Refactor SSE listener and improve logging for TELL updates GotthardG 2025-06-24 13:07:02 +02:00
• 7314a9dbf7 DAQ: Turn on front light after going from the sample alignment leonarski_f 2025-06-24 12:55:42 +02:00
• dee1fea329 DAQ: Offset Y for 2D raster scan only leonarski_f 2025-06-24 12:55:21 +02:00
• a9a7bd40f2 GUI: Save current omega leonarski_f 2025-06-24 11:32:30 +02:00
• eca90e7c51 DAQ: Raster scan fixes leonarski_f 2025-06-24 11:32:09 +02:00
• 7298f75dfa DAQ: Minor fixes to logic for setting up JFJoch dataset leonarski_f 2025-06-24 11:12:33 +02:00
• 35e7ad3ce0 Add SSE client support for TELL updates and enhance resilience GotthardG 2025-06-24 11:07:01 +02:00
• 443ed7aaca GUI: Fix run number for raster leonarski_f 2025-06-23 15:36:05 +02:00
• 7f75e0c673 GUI: Put spot count (low res.) in raster results leonarski_f 2025-06-23 15:00:38 +02:00
• 88199c8d49 GUI: For raster scan, one can browse through images leonarski_f 2025-06-23 13:11:45 +02:00
• 674a0e36eb GUI: Adjustments to be able to load images for a completed grid leonarski_f 2025-06-22 18:25:28 +02:00
• e135876766 GUI: Add more raster analysis methods leonarski_f 2025-06-22 14:29:34 +02:00
• e8961be15f Common: Upgrade jfjoch_client to 1.0.0rc51 leonarski_f 2025-06-22 14:25:08 +02:00
• bdf16aa724 GUI: WIP - option to load image for grid scan automatically leonarski_f 2025-06-22 14:24:20 +02:00
• 8b72e7f5d1 GUI: Sample camera settings fixed leonarski_f 2025-06-21 14:17:21 +02:00
• 90b4207a34 GUI: Sorting works leonarski_f 2025-06-21 14:04:30 +02:00
• 49d57e66e4 DAQ: Token validity = 1 1 week leonarski_f 2025-06-21 14:04:16 +02:00
• 9dcd322ddd GUI: Sorting is persistent over DB updates leonarski_f 2025-06-20 16:37:51 +02:00
• d083a1f4e0 GUI: Set default as 100 Hz leonarski_f 2025-06-20 13:48:41 +02:00
• 8271db82c2 DAQ/GUI: Improvements during the beamtime leonarski_f 2025-06-20 13:00:30 +02:00
• 855e2471c3 DAQ: ring current is always non-negative number leonarski_f 2025-06-18 21:15:59 +02:00
• 2805ce7bd0 GUI: Change default directory leonarski_f 2025-06-18 17:55:53 +02:00
• 05a01f4efb DAQ: More work during the beamtime preparations leonarski_f 2025-06-18 17:27:11 +02:00
• 486d65c7cc DAQ: WIP leonarski_f 2025-06-18 13:27:48 +02:00
• 8c517d4bab DAQ: Modifications of June 18th leonarski_f 2025-06-18 13:02:34 +02:00
• d66f758ff3 Added functions to create rotation and gridscans runs into aaredb.py GotthardG 2025-06-18 13:23:19 +02:00
• c670668dd0 DAQ: Integration of AareDB code (WIP) leonarski_f 2025-06-18 11:17:34 +02:00
• 44bc0046fb DAQ: Integration of AareDB code leonarski_f 2025-06-18 10:30:12 +02:00
• 6cfef536e2 Added functions to create rotation and gridscans runs into aaredb.py GotthardG 2025-06-18 09:02:24 +02:00
• fde6238c60 GUI: Fix default parameters for DiffractionGeometry leonarski_f 2025-06-17 17:27:32 +02:00
• fd345a2fe5 GUI: Raster grid manager add unit cell leonarski_f 2025-06-17 17:27:13 +02:00
• 3c7ae33b80 GUI: Add beamline name to BeamlineStatus leonarski_f 2025-06-17 16:22:36 +02:00
• dafda5adcb GUI: Add detector description and serial number leonarski_f 2025-06-17 16:16:54 +02:00
• cbd6c73890 GUI: Fix bug in raster grid shown wrong leonarski_f 2025-06-17 16:16:26 +02:00
• 136e85b2d7 Merge remote-tracking branch 'origin/tellupdater' leonarski_f 2025-06-17 14:22:04 +02:00
• f369e5b555 Refactor TELL integration and update dependencies. tellupdater GotthardG 2025-06-17 14:15:51 +02:00
• bf170cfcf5 Refactor TELL integration and update dependencies. GotthardG 2025-06-17 14:15:40 +02:00
• c6a4cf0e8b Refactor TELL integration and update dependencies. GotthardG 2025-06-17 14:13:46 +02:00
• 4b1acfb827 Refactor TELL integration and update dependencies. GotthardG 2025-06-17 13:43:15 +02:00
• 4003cbd2b1 Refactor TELL integration and update dependencies. GotthardG 2025-06-17 13:38:31 +02:00
• dc0874d8d4 Refactor TELL integration and update dependencies. GotthardG 2025-06-17 13:36:27 +02:00
• 7c37297156 DAQ: Read pixel size from the detector leonarski_f 2025-06-17 13:16:04 +02:00
• 81e481777f GUI: More beamtime improvements leonarski_f 2025-06-17 12:20:22 +02:00
• 4e15624036 GUI: Move sample in Smargon Z with shift+click leonarski_f 2025-06-17 11:00:29 +02:00
• a126f7ccb4 DAQ/GUI: Fixes during pre-beamtime test (2) leonarski_f 2025-06-17 10:44:50 +02:00
• a780222d27 Refactor TELL integration and update dependencies. GotthardG 2025-06-17 10:21:00 +02:00
• 7aeee1a029 DAQ/GUI: Fixes during pre-beamtime test leonarski_f 2025-06-17 09:05:21 +02:00
• 8034354427 DAQ/GUI: Go to ABR meas position leonarski_f 2025-06-16 15:04:06 +02:00
• ea698cfb94 DAQ: For screening every image goes with a dedicated trigger leonarski_f 2025-06-16 14:58:45 +02:00
• 8ee1336b15 DAQ: Update dtz at the beginning of the measurement (before going to data collection) leonarski_f 2025-06-16 14:57:36 +02:00
• 84b99e800b GUI: Change order of omega rotation buttons leonarski_f 2025-06-16 14:56:47 +02:00
• 5fdd3a3327 DAQ: Include JFJoch, first try leonarski_f 2025-06-16 11:27:09 +02:00
• 63fc40af7f GUI: Raster grid panel - logical direction for transparency slider leonarski_f 2025-06-16 10:29:11 +02:00
• ad8313b7f5 GUI: Use JFjoch data structure for results leonarski_f 2025-06-16 10:27:53 +02:00
• 451bd9f772 Models: Use jfjoch client result structure (WIP) leonarski_f 2025-06-16 08:37:52 +02:00
• 49a9f35e55 GUI: Minor improvements to grid scan result display leonarski_f 2025-06-13 20:34:00 +02:00
• 4f3977cddb GUI: One can choose metric for grid scan leonarski_f 2025-06-13 16:22:41 +02:00
• 0af913db13 GUI: Bottom panels are dockable, can be also turned off leonarski_f 2025-06-13 12:06:19 +02:00
• ab0b865066 GUI/DAQ: Refactor beam center and beam mark handling, update screening UI leonarski_f 2025-06-13 11:42:01 +02:00
• ca69bb0094 DAQ: Deconvolute beam mark / beam center leonarski_f 2025-06-13 11:33:39 +02:00
• 3988c345c9 GUI: Data collection running works leonarski_f 2025-06-13 11:19:29 +02:00
• 0d63d920d2 GUI: Typo in about box leonarski_f 2025-06-13 09:38:49 +02:00
• 1915b73508 GUI: Screening data collection tab - work in progress leonarski_f 2025-06-12 21:45:08 +02:00