Commit Graph

Select branches

Hide Pull Requests

2axis_npoint_controller-backup

add-bpm-mcs-interface

add/rio-galil-set-gain

back/lamni_commissioning

chore/update-template-c8c57619-89bb-4381-ab41-5ddf9f4437fd

ci/security_detection

ci/update_with_pkg_job

config-changes-bl-2026-05-28

config_and_fixes

copier-upgrade

csaxs_nexus_format

docs/csaxs_docs

docs/safety-page

doku_fix2

feat-add-saxs-widget

feat-csaxs-file-writer

feat/add-error-handling-to-on-complete-eiger

feat/add-simulated-bl-endstation-devices

feat/add_eiger_jjf

feat/add_flomni_ext_en

feat/add_galil_rio

feat/add_jungfrau_joch_integration

feat/add_panda_csaxs

feat/allied_vision_camera

feat/canon_crn300

feat/diagnostics

feat/eps_device

feat/flomni_queue_with_commands

feat/smargon

feature/flomni_scan_v4

feature/machine_config

feature/pseudo_positioner_flighttube

first_light_prep

fix-jfj-preview-client-log-spam-error

fix-jfjoch-client-version

fix-jungfraujoch_previev-client

fix/async_signal_refactoring

fix/beamtime_prep

fix/compare_transition_status

fix/controller-migration

fix/controller_destroy

fix/controller_ensure_wait_for_connection_called

fix/dap-recursion-backup

fix/dap-recursion-no-queue

fix/deprecate_pilatus_migrate_falcon

fix/fixes_flomni_testing

fix/fj_integration

fix/flomni_alarm

fix/flomni_async_readout

fix/hexapod-integration-attempt-ophyd

fix/lamni_fly_scan

fix/lamni_scan_fix

fix/mcs-card-extra-point-on-stop

fix/mcs_timeout

fix/minimal-safeguard-for-progress-update

fix/omny_alignment_type_hints

fix/online_fix_mcs_ddg_flomni

fix/rate_limit_warning_in_live_mode

fix/refactor_controller_ophyd_devices

fix/remove-info-logging-overloads

fix/remove-socket-cached-readings

fix/remove_bl_check

fix/rpc-experimental-fix

fix/setpoint_init

fix/shutter-signal

fix/socket-readback-timeout-test

fix/temp-xray-eye-timeout-fix

fixflomni-gui-tools-timeout

flomni_heater

gac-x12sa_20241004T141251

gac-x12sa_20250710T162233

ids_monochrome

main

progress

refactor/ids_camera

refactor/mcs_card_refactoring

refactor/module-structure

refactor/refactored_ddg_csaxs

sastt_config

scans-v4-fly-scan-line-and-grid

scans_v4_fly_grid_scan

smaract_implementation_ES

test_branch

test_branch_gitea

test_gitea

test_pseudo_device_implementierung

update/predict-gap-constants

update_bl_configs

update_bl_repos

update_flomni_config-backup

updates_at_beamline

updates_from_the_beamline_part2

x12sa_test_20250822T141018

x12sa_test_20251006T161237

x12sa_test_20260528T080421-backup

x12sa_test_20260617T101258-backup

x12sa_test_20260617T101258-backup-backup

#100

#101

#102

#103

#104

#105

#107

#108

#109

#110

#111

#112

#113

#114

#117

#118

#119

#120

#122

#124

#125

#126

#128

#129

#13

#130

#133

#134

#136

#138

#139

#14

#141

#142

#143

#144

#145

#146

#147

#148

#15

#151

#152

#153

#154

#155

#156

#157

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• c83140ba3f change from microstepping to normal controllers for samx and samy x12saandappel_c 2026-06-20 18:17:04 +02:00
• 661c546656 fix: put mcs callback cm in rlock wakonig_kandappel_c 2026-06-19 16:36:40 +02:00
• 03c288af34 fix(ddg1): fix suppress mcs updates appel_c 2026-06-19 16:23:00 +02:00
• 16d414904b add wait for acquiring compare status in on_complete of mcs card appel_c 2026-06-19 15:55:03 +02:00
• c35ab16653 fix: make mcs acquiring fetch without auto monitor wakonig_kandappel_c 2026-06-19 15:49:37 +02:00
• 57119403b4 wip add timestamp logs appel_c 2026-06-19 14:53:14 +02:00
• 6614be50d9 fix cont_grid scan appel_c 2026-06-19 14:23:06 +02:00
• 57b42fc1d1 move Compare status acquiring after erase-start call appel_c 2026-06-19 14:08:49 +02:00
• 77efd4f55e wip fix ddg mcs call appel_c 2026-06-19 14:04:23 +02:00
• 476dbb2969 fix(ddg): fix prepare_mcs_on_trigger method appel_c 2026-06-19 14:02:43 +02:00
• f5f3358b66 fix(ddg): put_complete for trigger_shot appel_c 2026-06-19 13:58:02 +02:00
• 2b5f9fb70c fix(cont-grid): fix cont grid timing issue appel_c 2026-06-19 13:54:11 +02:00
• 3f7d7f7634 f feature/flomni_scan_v4 x12sa 2026-06-22 22:12:23 +02:00
• 7f60c19f7a refactor(falcon): Migrate falcon to ScanServer ScanInfo model appel_candwakonig_k 2026-06-17 09:39:34 +02:00
• 165dbf3c69 feat: migrate to v4 scans wakonig_k 2026-05-20 10:23:17 +02:00
• 8f7614908e fix(docs): update OS version in Read the Docs configuration to ubuntu-24.04 wakonig_k 2026-06-21 18:17:41 +02:00
• 6ed82d2fea add estimated finish time to progress bar x12sa 2026-06-21 09:30:32 +02:00
• 906e91cc7f fix(gui_tools): remove all custom gui timeouts wyzula_jandholler 2026-05-22 17:22:43 +02:00
• dea43edcd9 fix(gui_tools): minimal ring progress bar safeguard in order to not interupt any script using it wyzula_jandholler 2026-05-22 17:17:20 +02:00
• dc3860e79b Merge branch 'main' into fix/minimal-safeguard-for-progress-update fix/minimal-safeguard-for-progress-update holler 2026-06-20 14:03:39 +02:00
• 48b21d806a fix(flomni): correct angular-step labeling, wire manual_shift_y, validate frames_per_trigger x12saandholler 2026-06-20 13:27:08 +02:00
• c4a581bbeb feat(flomni): add 360° tomo range and single-point acquire mode x12saandholler 2026-06-19 16:02:23 +02:00
• 778c3c6bf1 fix: incident energy appel_c 2026-06-19 13:25:02 +02:00
• b01ab791b7 fix(eiger): fix fetching energy appel_c 2026-06-19 13:08:27 +02:00
• cfef28e755 fix(eiger): Eiger should take initial energy from ccm appel_c 2026-06-19 13:04:30 +02:00
• 06507d01b8 add diodes in optics hutch x12saandappel_c 2026-06-18 11:56:17 +02:00
• 3c1d1cd2f5 correct epics channels for the KB HFM x12saandappel_c 2026-06-18 10:54:34 +02:00
• 5494b83652 refactor(bl-optics-config): update kb motors part 2 appel_c 2026-06-18 10:22:34 +02:00
• 05fd2274ed fix(bl-optics-hutch): add kb motors part 1 appel_c 2026-06-18 10:13:21 +02:00
• 5a2f20b656 refactor(bl-optics-config): Add bender to optics config x12saandappel_c 2026-06-18 10:07:10 +02:00
• 167a574a2f add beamstop diode and change to monitored x12saandappel_c 2026-06-17 17:45:42 +02:00
• 769d360acd correct beam center in eiger 9M config x12saandappel_c 2026-06-17 17:45:11 +02:00
• 61388f8112 update eiger 9M parameters x12saandappel_c 2026-06-17 14:39:39 +02:00
• 605555dddb add in position for scintillator in optics hutch x12saandappel_c 2026-06-17 11:07:43 +02:00
• 66efcb2b92 fix: incident energy updates_at_beamline appel_c 2026-06-19 13:25:02 +02:00
• 50a4941140 fix(eiger): fix fetching energy appel_c 2026-06-19 13:08:27 +02:00
• b4c3c0e9ad fix(eiger): Eiger should take initial energy from ccm appel_c 2026-06-19 13:04:30 +02:00
• 134395dadd Automatic backup triggered by new deployment x12sa_test_20260617T101258-backup-backup x12sa 2026-06-18 23:09:27 +02:00
• 9bc290412c add diodes in optics hutch x12sa 2026-06-18 11:56:17 +02:00
• fc4bac28aa correct epics channels for the KB HFM x12sa 2026-06-18 10:54:34 +02:00
• 12345585d6 refactor(bl-optics-config): update kb motors part 2 appel_c 2026-06-18 10:22:34 +02:00
• dead2b568e fix(bl-optics-hutch): add kb motors part 1 appel_c 2026-06-18 10:13:21 +02:00
• 18cc36bea1 refactor(bl-optics-config): Add bender to optics config x12sa 2026-06-18 10:07:10 +02:00
• 6b28c68efe add beamstop diode and change to monitored x12sa 2026-06-17 17:45:42 +02:00
• ebbe1c3fd6 correct beam center in eiger 9M config x12sa 2026-06-17 17:45:11 +02:00
• e16c6ebe87 update eiger 9M parameters x12sa 2026-06-17 14:39:39 +02:00
• 6dbe7ef6d7 Automatic backup triggered by new deployment x12sa_test_20260617T101258-backup x12sa 2026-06-17 14:26:57 +02:00
• 39780e31c0 add in position for scintillator in optics hutch x12sa 2026-06-17 11:07:43 +02:00
• 6590a65488 Automatic backup triggered by new deployment update_flomni_config-backup x12sa 2026-06-17 10:13:42 +02:00
• a74144aba1 update flomni config x12saandwakonig_k 2026-06-17 10:11:01 +02:00
• c7cc94037c update flomni config x12sa 2026-06-17 10:11:01 +02:00
• d449e01f95 fix(gui_tools): remove all custom gui timeouts wyzula_j 2026-05-22 17:22:43 +02:00
• 5624467544 fix(gui_tools): minimal ring progress bar safeguard in order to not interupt any script using it wyzula_j 2026-05-22 17:17:20 +02:00
• 2cbe3737ce feat(canon): add Canon CR-N300 PTZ camera device (Phase 1) feat/canon_crn300 menzelandClaude Opus 4.8 2026-06-16 21:05:05 +02:00
• 6ea2bf18fd fix(bl-frontend-config): migrate EpicsMotor to EpicsMotorEC appel_c 2026-06-16 21:47:22 +02:00
• 75db1c3e09 refactor: adapt optics_hutch motor to ECMC motors x12saandappel_c 2026-06-16 16:58:29 +02:00
• 94ba2ca7e8 fix(eiger): switch eiger back to eiger_9m config x12saandappel_c 2026-06-16 16:58:01 +02:00
• 8f16072010 fix(bl-frontend-config): migrate EpicsMotor to EpicsMotorEC scans_v4_fly_grid_scan appel_c 2026-06-16 21:47:22 +02:00
• cdd211cd16 refactor: adapt optics_hutch motor to ECMC motors x12sa 2026-06-16 16:58:29 +02:00
• 986cfb0787 fix(eiger): switch eiger back to eiger_9m config x12sa 2026-06-16 16:58:01 +02:00
• 00651450d0 feat: add machine config feature/machine_config wakonig_kandappel_c 2026-06-15 22:52:24 +02:00
• cb0d4cf999 test(eiger): skip on_connected du to change of config to 8_5M from 9M appel_c 2026-06-16 16:22:20 +02:00
• c1619111cf refactor(bl-optics): adapt bl_optics_hutch x12sa 2026-06-16 15:58:09 +02:00
• 36536eefc4 fix(config-main): move devices from main to user_setup.yaml x12sa 2026-06-16 15:57:37 +02:00
• efcf9b3f3e fix(eiger): move eiger to use config for 8.5M x12sa 2026-06-16 15:54:52 +02:00
• c7fd2f1435 fix(ddg1): fix flaky state check of mcs card x12sa 2026-06-16 11:57:16 +02:00
• e86a17dce1 fix(cont-grid): fix progress updates for cont grid scan appel_c 2026-06-16 08:52:52 +02:00
• a69276eb81 Automatic backup triggered by new deployment x12sa_test_20260528T080421-backup x12sa 2026-06-15 17:13:26 +02:00
• d98657149d wip from beamline x12sa 2026-06-15 16:32:38 +02:00
• 93d7e1662a refactor: migrate devices to new scan_info from scan_server appel_c 2026-06-15 15:44:17 +02:00
• 0aabd49ed1 refactor: migrate devices to new scans_v4 structure appel_c 2026-06-15 14:01:48 +02:00
• 6dc3c13137 fix: cont_grid scan fixes appel_c 2026-06-15 14:01:33 +02:00
• 7a4c19f38f feat(utils): add utils to migrate previous scan_info to scans_v4 scan_info appel_c 2026-06-15 14:01:16 +02:00
• 20b892f990 refactor(ddg): add user access method to ddg appel_c 2026-06-15 13:29:08 +02:00
• adcd7b14cf feat(cont_grid): add continuous grid scan appel_c 2026-06-15 13:28:46 +02:00
• f964a3ee7b test: skip test_on_complete_error_message first_light_prep appel_c 2026-06-15 15:47:54 +02:00
• d8344064a0 add update to main with eiger added x12sa 2026-06-15 15:40:43 +02:00
• 8c83d84eaa add eiger9 in to config x12sa 2026-06-15 15:40:05 +02:00
• 3daadddb20 adding some user parameters x12sa 2026-06-15 15:39:17 +02:00
• 8ebf81f06b fix(eiger): migrate eiger integration to jfjoch-client.rc148 x12sa 2026-06-15 10:48:08 +02:00
• 820e22a2d4 small changes for readout signals x12sa 2026-06-12 10:23:25 +02:00
• 6f37c56547 patch for Smaract controller in optics hutch x12sa 2026-06-08 16:52:53 +02:00
• f04aacff8c change slit names according to convention x12sa 2026-06-08 13:34:17 +02:00
• a0068a8ecd implement 2 sets of slits in optics hutch x12sa 2026-06-08 13:31:33 +02:00
• 8e65116b08 fix(dependencies): pin cbor2 version to 5.9.0 wakonig_k 2026-06-02 17:01:48 +02:00
• 2f5ab3079a changed the readoutPriority for galilrioesxbox, gain_bpm_xbox2, and gain_bim_xbox3 to baseline update_bl_configs x12sa 2026-06-02 15:34:54 +02:00
• 404d28a7ba Update configs for beam intensity monitor Xbox3 x12sa 2026-06-02 15:12:41 +02:00
• 9fe4acdd94 update configuration of smaract in optics hutch and experimental hutch. Correct some parameters in the readout of XBPMs x12sa 2026-06-02 13:04:59 +02:00
• 1a87b77af7 feat(bpm-mcs): Add MCSBPM device add-bpm-mcs-interface appel_c 2026-06-01 15:39:05 +02:00
• d0e6414795 fix(bpm): fix kind types for bpm devices. x12sa 2026-06-01 09:52:36 +02:00
• 46c1ddb64d add micro-stepping card and IDS camera examples in user_template.yaml x12sa 2026-05-28 16:08:34 +02:00
• d378f259bf chore: storing changes of bl device configs config-changes-bl-2026-05-28 x12sa 2026-05-28 07:59:56 +02:00
• db86001e30 Automatic backup triggered by new deployment fix/dap-recursion-backup x12sa 2026-05-22 08:40:08 +02:00
• a072e300d9 fix(x_ray_eye): remove camera shutdown during cleanup fix/temp-xray-eye-timeout-fix wyzula_j 2026-05-21 10:35:31 +02:00
• 5e6cda1bf2 fix(x_ray_eye): async device call execution wyzula_j 2026-05-17 21:18:31 +02:00
• 541c3829b1 fix(x_ray_eye): disabled cleanup turn off the live mode wyzula_j 2026-05-20 18:57:29 +02:00
• 71946e1c79 fix: fetch the status of the queue in next event loop wyzula_j 2026-05-19 15:36:35 +02:00
• a568656389 fix: disable controls for device input and toggles wyzula_j 2026-05-19 11:20:36 +02:00
• 32034a7c59 fix: subscribe dap updates before align and unsubscribe after align is done wyzula_j 2026-05-18 11:33:47 +02:00
• 480ff259dc fix: remove .wait() from omny_xray_gui in on_dap_params in gui wyzula_j 2026-05-18 11:13:00 +02:00