bec/pxiii_bec
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/device-aerotech-a3200

Browse Source
This commit is contained in:
panepucci
2024-07-09 11:15:13 +02:00
parent 65800812a5 f22487a45b
commit 4a6e4092ca
4 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pxiii_bec/bec_widgets/auto_updates.py
View File

@@ -1,4 +1,4 @@
from bec_widgets.cli import AutoUpdates, ScanInfo
from bec_widgets.cli.auto_updates import AutoUpdates, ScanInfo
class PlotUpdate(AutoUpdates):

2
pxiii_bec/deployment/device_server/startup.py
View File

@@ -3,7 +3,7 @@ import os
def setup_epics_ca():
os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "NO"
os.environ["EPICS_CA_ADDR_LIST"] = "129.129.122.255 sls-x12sa-cagw.psi.ch:5836"
os.environ["EPICS_CA_ADDR_LIST"] = "129.129.110.255"
os.environ["PYTHONIOENCODING"] = "latin1"

27
pxiii_bec/device_configs/x06da_compact.lmay
View File

@@ -10,7 +10,7 @@ slh_trxw:
fi1_try:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-OP-FI1:TRY1'
prefix: 'X06DA-OP-FI1:TRY'
# DCCM crystal 1
dccm_pitch1:
@@ -40,24 +40,37 @@ dccm_xbpm:
deviceConfig:
prefix: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV'
# DCCM common
dccm_energy:
description: Monochromator energy using ECMC virtual motors
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-OP-DCCM:_ENERGY'
dccm_eoffset:
description: Monochromator energy offset for ECMC virtual motors
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-OP-DCCM:_EOFFSET'
# Secondary source XBPM
ssxbpm_trx:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-ES-SSBPM1:TRX1'
prefix: 'X06DA-ES-SSBPM1:TRX'
ssxbpm_try:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-ES-SSBPM1:TRY1'
prefix: 'X06DA-ES-SSBPM1:TRY'
ssslit_trxr:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-ES-SSSH1:TRXI'
prefix: 'X06DA-ES-SSSH1:TRXR'
ssslit_trxw:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-ES-SSSH1:TRXO'
prefix: 'X06DA-ES-SSSH1:TRXW'
ssslit_tryt:
deviceClass: ophyd.EpicsMotor
deviceConfig:
@@ -69,11 +82,11 @@ ssslit_tryb:
ssxi1_trx:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-ES-SSXI1:TRX1'
prefix: 'X06DA-ES-SSXI1:TRX'
ssxi1_try:
deviceClass: ophyd.EpicsMotor
deviceConfig:
prefix: 'X06DA-ES-SSXI1:TRY1'
prefix: 'X06DA-ES-SSXI1:TRY'
# Vertical focusing mirror
vfm_trxu:

33
pxiii_bec/device_configs/x06da_device_config.yaml
View File

@@ -1,3 +1,4 @@
slh_trxr:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-OP-SLH:TRXR'}
@@ -16,7 +17,7 @@ slh_trxw:
softwareTrigger: false
fi1_try:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-OP-FI1:TRY1'}
deviceConfig: {prefix: 'X06DA-OP-FI1:TRY'}
onFailure: buffer
enabled: true
readoutPriority: monitored
@@ -62,6 +63,24 @@ dccm_energy2:
readoutPriority: monitored
readOnly: false
softwareTrigger: false
dccm_energy:
description: Monochromator energy using ECMC virtual motors
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-OP-DCCM:_ENERGY'}
onFailure: buffer
enabled: true
readoutPriority: monitored
readOnly: false
softwareTrigger: false
dccm_eoffset:
description: Monochromator energy offset between crystals using ECMC virtual motors
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-OP-DCCM:_EOFFSET'}
onFailure: buffer
enabled: true
readoutPriority: monitored
readOnly: false
softwareTrigger: false
dccm_xbpm:
deviceClass: ophyd.EpicsSignalRO
deviceConfig: {read_pv: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV'}
@@ -72,7 +91,7 @@ dccm_xbpm:
softwareTrigger: false
ssxbpm_trx:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRX1'}
deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRX'}
onFailure: buffer
enabled: true
readoutPriority: monitored
@@ -80,7 +99,7 @@ ssxbpm_trx:
softwareTrigger: false
ssxbpm_try:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRY1'}
deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRY'}
onFailure: buffer
enabled: true
readoutPriority: monitored
@@ -88,7 +107,7 @@ ssxbpm_try:
softwareTrigger: false
ssslit_trxr:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXI'}
deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXR'}
onFailure: buffer
enabled: true
readoutPriority: monitored
@@ -96,7 +115,7 @@ ssslit_trxr:
softwareTrigger: false
ssslit_trxw:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXO'}
deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXW'}
onFailure: buffer
enabled: true
readoutPriority: monitored
@@ -120,7 +139,7 @@ ssslit_tryb:
softwareTrigger: false
ssxi1_trx:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRX1'}
deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRX'}
onFailure: buffer
enabled: true
readoutPriority: monitored
@@ -128,7 +147,7 @@ ssxi1_trx:
softwareTrigger: false
ssxi1_try:
deviceClass: ophyd.EpicsMotor
deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRY1'}
deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRY'}
onFailure: buffer
enabled: true
readoutPriority: monitored