From bf652a6411f2a9584cf52eada08c3fb48fd7f853 Mon Sep 17 00:00:00 2001 From: e20643 Date: Tue, 12 Sep 2023 08:52:31 +0200 Subject: [PATCH] fix: changes e20643 --- .../configs/bec_device_config_sastt.yaml | 170 +++++++++--------- bin/setup_bec.sh | 16 +- 2 files changed, 95 insertions(+), 91 deletions(-) diff --git a/bec_plugins/configs/bec_device_config_sastt.yaml b/bec_plugins/configs/bec_device_config_sastt.yaml index 7da511d..697ce30 100755 --- a/bec_plugins/configs/bec_device_config_sastt.yaml +++ b/bec_plugins/configs/bec_device_config_sastt.yaml @@ -2121,23 +2121,23 @@ sls_machine_status: # onFailure: buffer # status: # enabled: true -# sls_ring_current: -# acquisitionConfig: -# acquisitionGroup: monitor -# readoutPriority: monitored -# schedule: sync -# deviceClass: EpicsSignalRO -# deviceConfig: -# auto_monitor: true -# name: sls_ring_current -# read_pv: ARIDI-PCT:CURRENT -# string: false -# deviceTags: -# - SLS status -# name: sls_ring_current -# onFailure: buffer -# status: -# enabled: true +sls_ring_current: + acquisitionConfig: + acquisitionGroup: monitor + readoutPriority: monitored + schedule: sync + deviceClass: EpicsSignalRO + deviceConfig: + auto_monitor: true + name: sls_ring_current + read_pv: ARIDI-PCT:CURRENT + string: false + deviceTags: + - SLS status + name: sls_ring_current + onFailure: buffer + status: + enabled: true # strox: # acquisitionConfig: # acquisitionGroup: motor @@ -2472,10 +2472,10 @@ ddg_detectors: delta_width: 0 additional_triggers: 0 polarity: - - 1 - - 0 - - 0 - - 1 + - 1 # T0 -> DDG MCS + - 0 # eiger + - 1 # falcon + - 1 - 1 amplitude: 4.5 offset: 0 @@ -2552,22 +2552,22 @@ ddg_fsh: onFailure: buffer status: enabled: true -# falcon: -# acquisitionConfig: -# acquisitionGroup: detector -# readoutPriority: baseline -# schedule: sync -# description: Falcon detector x-ray fluoresence -# deviceClass: epics:devices:FalconCsaxs -# deviceConfig: -# name: falcon -# prefix: 'X12SA-SITORO:' -# deviceTags: -# - cSAXS -# - falcon -# onFailure: buffer -# status: -# enabled: true +falcon: + acquisitionConfig: + acquisitionGroup: detector + readoutPriority: baseline + schedule: sync + description: Falcon detector x-ray fluoresence + deviceClass: epics:devices:FalconCsaxs + deviceConfig: + name: falcon + prefix: 'X12SA-SITORO:' + deviceTags: + - cSAXS + - falcon + onFailure: buffer + status: + enabled: true pilatus_2: acquisitionConfig: acquisitionGroup: monitor @@ -2691,52 +2691,52 @@ micfoc: # onFailure: buffer # status: # enabled: true -rotx: - acquisitionConfig: - acquisitionGroup: motor - readoutPriority: baseline - schedule: sync - deviceClass: epics:devices:EpicsMotorEx - deviceConfig: - name: rotx - prefix: X12SA-ES2-ES05 - motor_resolution: 0.0025 - base_velocity: 0.5 - velocity: 7.5 - backlash_distance: 0.25 - acceleration: 0.2 - user_offset_dir: 1 - limits: - - -0.1 - - 0.1 - deviceTags: - - cSAXS - - rotx - onFailure: buffer - status: - enabled: true -roty: - acquisitionConfig: - acquisitionGroup: motor - readoutPriority: baseline - schedule: sync - deviceClass: epics:devices:EpicsMotorEx - deviceConfig: - name: roty - prefix: X12SA-ES2-ES04 - motor_resolution: 0.0025 - base_velocity: 0.5 - velocity: 7.5 - backlash_distance: 0.25 - acceleration: 0.2 - user_offset_dir: 0 - limits: - - -365 - - 5 - deviceTags: - - cSAXS - - roty - onFailure: buffer - status: - enabled: true +# rotx: +# acquisitionConfig: +# acquisitionGroup: motor +# readoutPriority: baseline +# schedule: sync +# deviceClass: epics:devices:EpicsMotorEx +# deviceConfig: +# name: rotx +# prefix: X12SA-ES2-ES05 +# motor_resolution: 0.0025 +# base_velocity: 0.5 +# velocity: 7.5 +# backlash_distance: 0.25 +# acceleration: 0.2 +# user_offset_dir: 1 +# limits: +# - -0.1 +# - 0.1 +# deviceTags: +# - cSAXS +# - rotx +# onFailure: buffer +# status: +# enabled: true +# roty: +# acquisitionConfig: +# acquisitionGroup: motor +# readoutPriority: baseline +# schedule: sync +# deviceClass: epics:devices:EpicsMotorEx +# deviceConfig: +# name: roty +# prefix: X12SA-ES2-ES04 +# motor_resolution: 0.0025 +# base_velocity: 0.5 +# velocity: 7.5 +# backlash_distance: 0.25 +# acceleration: 0.2 +# user_offset_dir: 0 +# limits: +# - -365 +# - 5 +# deviceTags: +# - cSAXS +# - roty +# onFailure: buffer +# status: +# enabled: true diff --git a/bin/setup_bec.sh b/bin/setup_bec.sh index 61bfcab..2ca42a8 100755 --- a/bin/setup_bec.sh +++ b/bin/setup_bec.sh @@ -5,17 +5,18 @@ if [! "pc15543" == "$hostname" ]; then fi module add psi-python38/2020.11 -module add tmux/3.2 -module add redis/7.0.12 +echo module add tmux/3.2 >> ~/.bashrc +echo module add redis/7.0.12 >> ~/.bashrc + +source ~/.bashrc cd ~/Data10 mkdir -p software/ - +mkdir -p ~/bec/scripts cd software git clone https://gitlab.psi.ch/bec/bec.git git clone https://gitlab.psi.ch/bec/ophyd_devices.git -git clone https://gitlab.psi.ch/bec/csaxs-bec.git git clone https://gitlab.psi.ch/bec/bec-widgets.git python -m venv ./bec_venv @@ -27,12 +28,15 @@ pip install -e ./bec_server[dev] cd ../csaxs-bec pip install -e .[dev] +redis-server --protected-mode no & read -p "Do you want to set the current BEC account to $whoami? (yes/no) " yn +val=$(whoami) + case $yn in - yes ) echo ok, setting account to $whoami; - redis-cli SET internal/account:val $whoami;; + yes ) echo ok, setting account to $val; + redis-cli SET internal/account:val $val;; no ) echo ;; * ) echo invalid response; exit 1;;