Commit Graph

Select branches

Hide Pull Requests

2axis_npoint_controller

add/rio-galil-set-gain

back/lamni_commissioning

ci/security_detection

ci/update_with_pkg_job

config_and_fixes

copier-upgrade

csaxs_nexus_format

docs/csaxs_docs

doku_fix2

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

feat/eps_device

feature/pseudo_positioner_flighttube

fix-jfjoch-client-version

fix/async_signal_refactoring

fix/compare_transition_status

fix/controller-migration

fix/controller_destroy

fix/controller_ensure_wait_for_connection_called

fix/deprecate_pilatus_migrate_falcon

fix/fixes_flomni_testing

fix/fixes_flomni_testing2

fix/fixes_flomni_testing3

fix/fj_integration

fix/flomni_alarm

fix/flomni_async_readout

fix/lamni_fly_scan

fix/lamni_scan_fix

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

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

fix/shutter-signal

fix/socket-readback-timeout-test

fix/update_lamni

fixes/lamni_improvements

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

smaract_implementation_ES

test_branch

test_branch_gitea

test_gitea

test_pseudo_device_implementierung

update_bl_repos

x12sa_test_20250822T141018

x12sa_test_20251006T161237

#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

#21

#22

#23

#24

#25

#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

• 195a382af4 ci: update gitlab ci file with package dependency job ci/update_with_pkg_job appel_c 2024-04-29 08:44:22 +02:00
• 74d941c249 Merge branch 'backlashcommandfix' into 'main' wakonig_k 2024-04-26 10:32:17 +02:00
• f601593c77 test(galil): fixed wrong backlash assert wakonig_k 2024-04-26 10:29:57 +02:00
• e0d93cd84e backlashcommandfix Holler Mirko 2024-04-26 10:00:44 +02:00
• 803dffb9cd Merge branch 'fix' into 'main' wakonig_k 2024-04-25 23:32:09 +02:00
• 0849d093f8 ci: fixed security detection job ci/security_detection wakonig_k 2024-04-25 15:58:05 +02:00
• 3cbafa51be fix Holler Mirko 2024-04-25 15:40:53 +02:00
• de10eb95e1 Merge branch 'fix/file_writer' into 'main' appel_c 2024-04-23 19:07:11 +02:00
• bb7786c808 fix: added missing nexus layout wakonig_k 2024-04-23 18:24:34 +02:00
• cdd47e8dbb Merge branch 'build/fixed_plugin_import' into 'main' wakonig_k 2024-04-22 19:34:10 +02:00
• 97224e37cf fix: fixed CA startup for device server wakonig_k 2024-04-22 19:29:28 +02:00
• 124878a064 Merge branch 'build/fixed_plugin_import' into 'main' wakonig_k 2024-04-22 19:19:50 +02:00
• 1a4e992d2f fix: fixed startup and entry points wakonig_k 2024-04-22 19:06:43 +02:00
• 0a59439ecc build: fixed plugin import wakonig_k 2024-04-22 18:44:22 +02:00
• 140ceb7359 Merge branch 'feat/transition_to_new_plugin_structure' into 'main' appel_c 2024-04-19 17:56:43 +02:00
• 4326c5b4a0 ci: add ci file appel_c 2024-04-19 15:18:13 +02:00
• daf1ec0317 refactor: updated configs, minor improvements, formatting appel_c 2024-04-19 14:04:15 +02:00
• c109abce12 feat: populated csaxs_bec from ophyd and bec appel_c 2024-04-19 12:09:03 +02:00
• 96921da618 feat: removed old and introduced new structure appel_c 2024-04-18 09:37:58 +02:00
• 058be66aaa Merge branch 'doc-pmodule-update' into 'master' wakonig_k 2024-03-13 21:29:46 +01:00
• b2786dca83 doc: psi-python311/2024.02 is now stable usov_i 2024-03-12 13:32:35 +01:00
• cc2e0ecaa3 refactor: converted to new plugin structure update_bl_repos wakonig_k 2024-03-10 21:09:06 +01:00
• a912dcc6c2 Merge branch 'drop-python39' into 'master' wakonig_k 2024-03-05 22:40:36 +01:00
• a6736340db ci: drop python/3.9 usov_i 2024-03-05 12:58:49 +01:00
• 6e7afcf4e4 Merge branch 'python39' into 'master' wakonig_k 2024-03-05 11:36:38 +01:00
• abe778c49b refactor: update to psi-python39/2021.11 in deploy scripts usov_i 2023-12-12 16:52:01 +01:00
• e7246b44ba refactor: replace deprecated imports from typing usov_i 2023-12-12 16:42:00 +01:00
• 0856cd345b build: require python3.9 usov_i 2023-12-12 16:36:27 +01:00
• e2a12b5d2f Merge branch 'fix-imports' into 'master' wakonig_k 2023-12-08 12:45:18 +01:00
• cdb370d6f5 fix: update imports usov_i 2023-12-08 12:21:26 +01:00
• 9794d08f0a fix: online changes same sample name appel_c 2023-09-27 11:46:52 +02:00
• 25d5bf6c40 fix: add git_hooks precommit to repo appel_c 2023-09-27 11:46:22 +02:00
• 59d19ceb6c refactor: archiving script appel_c 2023-09-27 11:42:05 +02:00
• ce228c4c44 fix: added epics as dependency (needed for client plugins) wakonig_k 2023-09-25 13:55:24 +02:00
• f483ed7cbd Merge branch 'master' of https://gitlab.psi.ch/bec/csaxs-bec e21536 2023-09-21 10:37:24 +02:00
• 6b51ad110a fix: changes for saxs_params_start_stop e21536 2023-09-21 10:34:21 +02:00
• 17d90fced0 fix: small adjustments of ddocs and function call appel_c 2023-09-19 10:45:04 +02:00
• 35ea790c19 fix: add documentation appel_c 2023-09-19 10:38:48 +02:00
• d1cc075f89 refactor: remove token from __main__ appel_c 2023-09-19 10:36:10 +02:00
• a543f751b3 feat: add script to manual archive data e20643 2023-09-19 10:34:33 +02:00
• 35b89ab86f fix: black formatting e20639 2023-09-18 11:33:41 +02:00
• e81c921f56 fix: add feature to saxs_params_start_stop automatically reduce scans to less than 10000 points e20639 2023-09-18 11:32:43 +02:00
• 849ed3c7ad fix: archiver csaxs data folder e20639 2023-09-15 18:06:34 +02:00
• 1f09c05575 fix: updates and online changes from e20639 e20639 2023-09-15 17:53:10 +02:00
• 000c25f1ec fix: fix formatting using black e20639 2023-09-13 17:18:19 +02:00
• fea92be3e4 feat: add setup_bec_widgets to repository e20639 2023-09-13 17:16:04 +02:00
• 74dd72f5b0 fix: add saxs_params for user scripts with new layout of motor controller e20639 2023-09-13 17:15:05 +02:00
• e73048b036 fix: add startup script for bec e20639 2023-09-13 17:13:36 +02:00
• b2bb7064d8 fix: update readme documentation e20639 2023-09-13 17:12:27 +02:00
• 341c49f868 fix: complement text to readme e20639 2023-09-13 10:58:51 +02:00
• 60cb11c681 fix: updated readme.md with notes on operation e20639 2023-09-13 10:57:49 +02:00
• bf652a6411 fix: changes e20643 e20643 2023-09-12 08:52:31 +02:00
• ddb2bf3ad1 fix: updated device config from 20636 e20636 2023-09-09 10:10:28 +02:00
• 9bbf24faf9 fix: online changes e20636 2023-09-09 09:44:56 +02:00
• b452436a1a feat: add saxs_params macro appel_c 2023-09-07 14:10:12 +02:00
• b1b2aff5d1 feat: add pilatus 2 converter to repository appel_c 2023-09-07 14:09:22 +02:00
• 6571c66038 Merge branch 'saxs_online_changes' into 'master' wakonig_k 2023-09-07 11:11:10 +02:00
• f942e72cde feat: add config for sastt from e21206 comissioning tests appel_c 2023-09-07 10:55:11 +02:00
• f5dcac7f83 fix: improved bec setup script appel_c 2023-09-07 09:58:29 +02:00
• 1630a59512 feat: added shell scripts appel_c 2023-09-06 08:58:02 +02:00
• ef33838ffe feat: added service config helper wakonig_k 2023-09-05 16:16:24 +02:00
• 7e60f3f9b5 feat: added bl checks to startup wakonig_k 2023-09-04 19:58:38 +02:00
• cff5bcd411 feat: added startup script for setting up epics ca wakonig_k 2023-08-31 08:41:53 +02:00
• 2335e2ccc1 build: fixed deployment script wakonig_k 2023-07-10 10:30:59 +02:00
• 01248d90c9 fix: fixed typo wakonig_k 2023-07-07 14:41:11 +02:00
• 26fe056c4a testing deployment wakonig_k 2023-07-07 14:39:22 +02:00
• 98eaa4d1de refactor: changes for new plugin structure wakonig_k 2023-07-07 10:21:25 +02:00
• 0c142fa452 updated branch wakonig_k 2023-05-20 14:17:49 +02:00
• 276dcf130d added submodule wakonig_k 2023-05-20 14:14:40 +02:00
• 0d3140e322 added lamni config wakonig_k 2023-04-23 20:09:32 +02:00
• 03d55f0f39 moved plugins into bec directory; added config directory wakonig_k 2023-04-23 20:06:58 +02:00
• 7a7d15b43f Delete .DS_Store wakonig_k 2022-12-09 10:37:14 +00:00
• d31e28cb83 Delete .DS_Store wakonig_k 2022-12-09 10:37:07 +00:00
• 117c96c38b Delete .DS_Store wakonig_k 2022-12-09 10:36:55 +00:00
• a8eae094eb refactor: export from bec repo wakonig_k 2022-12-09 11:36:05 +01:00
• 172d6fe570 Initial commit wakonig_k 2022-12-08 17:03:10 +00:00