From 1834e6f55d9c0b8b471b0a85bc667ab963e0b306 Mon Sep 17 00:00:00 2001 From: gac-x06da Date: Fri, 21 Jun 2024 11:07:39 +0200 Subject: [PATCH 1/4] Klaus changed EPICS_CA_ADDR_LIST to PX III --- pxiii_bec/deployment/device_server/startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pxiii_bec/deployment/device_server/startup.py b/pxiii_bec/deployment/device_server/startup.py index 1b47efc..5128368 100644 --- a/pxiii_bec/deployment/device_server/startup.py +++ b/pxiii_bec/deployment/device_server/startup.py @@ -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" From 989dc4be36ac3c1e6100a67def4e7c4eb8884c95 Mon Sep 17 00:00:00 2001 From: wyzula-jan Date: Mon, 8 Jul 2024 14:20:21 +0200 Subject: [PATCH 2/4] fix(auto_updates): import from bec_widgets cli autoupdates fixed --- pxiii_bec/bec_widgets/auto_updates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pxiii_bec/bec_widgets/auto_updates.py b/pxiii_bec/bec_widgets/auto_updates.py index abb8c78..573bcd8 100644 --- a/pxiii_bec/bec_widgets/auto_updates.py +++ b/pxiii_bec/bec_widgets/auto_updates.py @@ -1,4 +1,4 @@ -from bec_widgets.cli import AutoUpdates, ScanInfo +from bec_widgets.cli.auto_updates import AutoUpdates, ScanInfo class PlotUpdate(AutoUpdates): From 8c4ade4034c38b678c57f1f3cb366ca69601efe4 Mon Sep 17 00:00:00 2001 From: panepucci Date: Mon, 8 Jul 2024 15:23:50 +0200 Subject: [PATCH 3/4] Naming convention updates for OP --- pxiii_bec/device_configs/x06da_compact.lmay | 15 ++++++++++++- .../device_configs/x06da_device_config.yaml | 21 ++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/pxiii_bec/device_configs/x06da_compact.lmay b/pxiii_bec/device_configs/x06da_compact.lmay index f199cd9..c2697b0 100644 --- a/pxiii_bec/device_configs/x06da_compact.lmay +++ b/pxiii_bec/device_configs/x06da_compact.lmay @@ -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,6 +40,19 @@ 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 diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml index 16388a1..dbec3ed 100644 --- a/pxiii_bec/device_configs/x06da_device_config.yaml +++ b/pxiii_bec/device_configs/x06da_device_config.yaml @@ -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'} From ace030330120053ea717d3c832c213ba8e775db5 Mon Sep 17 00:00:00 2001 From: panepucci Date: Mon, 8 Jul 2024 15:42:03 +0200 Subject: [PATCH 4/4] Naming convention updates for OP --- pxiii_bec/device_configs/x06da_compact.lmay | 12 ++++++------ pxiii_bec/device_configs/x06da_device_config.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pxiii_bec/device_configs/x06da_compact.lmay b/pxiii_bec/device_configs/x06da_compact.lmay index c2697b0..4684593 100644 --- a/pxiii_bec/device_configs/x06da_compact.lmay +++ b/pxiii_bec/device_configs/x06da_compact.lmay @@ -57,20 +57,20 @@ dccm_eoffset: 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: @@ -82,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: diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml index dbec3ed..1893b72 100644 --- a/pxiii_bec/device_configs/x06da_device_config.yaml +++ b/pxiii_bec/device_configs/x06da_device_config.yaml @@ -91,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 @@ -99,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 @@ -107,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 @@ -115,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 @@ -139,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 @@ -147,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