From 026784a97d7658422e7122db6808a18abcaeafc7 Mon Sep 17 00:00:00 2001
From: x10sa <x10sa@psi.ch>
Date: Fri, 14 Nov 2025 11:36:19 +0100
Subject: [PATCH] Update device configs with new ComputedSignals

---
 .../device_configs/pxii-autogenerated.yaml    | 1364 +++++++++++++++++
 .../pxii-autogenerated.yaml.bak               | 1331 ++++++++++++++++
 .../device_configs/x10sa_device_config.yaml   |   38 +-
 .../x10sa_device_config_testing.yaml          |   99 ++
 4 files changed, 2829 insertions(+), 3 deletions(-)
 create mode 100644 pxii_bec/device_configs/pxii-autogenerated.yaml
 create mode 100644 pxii_bec/device_configs/pxii-autogenerated.yaml.bak
 create mode 100644 pxii_bec/device_configs/x10sa_device_config_testing.yaml

diff --git a/pxii_bec/device_configs/pxii-autogenerated.yaml b/pxii_bec/device_configs/pxii-autogenerated.yaml
new file mode 100644
index 0000000..dd3d40f
--- /dev/null
+++ b/pxii_bec/device_configs/pxii-autogenerated.yaml
@@ -0,0 +1,1364 @@
+sls_current:
+  description: SLS current
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - SLS
+  readOnly: true
+  softwareTrigger: false
+fe_bpm1:
+  description: FE XBPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpm2:
+  description: FE XBPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpm3:
+  description: FE XBPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpm4:
+  description: FE XBPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpmsum:
+  description: FE XBPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm1:
+  description: LU BPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm2:
+  description: LU BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm3:
+  description: LU BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm4:
+  description: LU BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpmsum:
+  description: LU BPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm1:
+  description: BSC BPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm2:
+  description: BSC BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm3:
+  description: BSC BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm4:
+  description: BSC BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpmsum:
+  description: BSC BPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_camx:
+  description: BSC camera X
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - cam
+  readOnly: true
+  softwareTrigger: false
+bsc_camy:
+  description: BSC camera Y
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - cam
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm1:
+  description: BCU BPM Signal 1 
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm2:
+  description: BCU BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm3:
+  description: BCU BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm4:
+  description: BCU BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpmsum:
+  description: BCU BPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+i1:
+  description: i1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-KBOX_K:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+i2:
+  description: i2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-XEYE_K:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+samcam_x:
+  description: sample cam X 
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:CentroidX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_xsig:
+  description: sample cam X sigma
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:SigmaX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_y:
+  description: sample cam Y 
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:CentroidY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_ysig:
+  description: sample cam Y sigma
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:SigmaY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_exp:
+  description: sample cam exp time 
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:cam1:AcquireTime', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: false
+  softwareTrigger: false
+samcam_max:
+  description: sample cam max value
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:MaxValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+bsccam_x:
+  description: BSC cam X
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+bsccam_y:
+  description: BSC cam Y
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+bsc_cam_exp:
+  description: BSC camera exposure
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:cam1:AcquireTime', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+bsc_cam_gain:
+  description: BSC camera gain
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:cam1:Gain', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+fe_bpm_x:
+  description: FE BPM X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_bpm_y:
+  description: FE BPM Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxr:
+  description: FE Slit X Ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_syt:
+  description: FE Slit Y top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxw:
+  description: FE Slit X Wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_syb:
+  description: FE SlitY Bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxcen:
+  description: FE Slit X Centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:CENTERX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxsize:
+  description: FE Slit X Size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:SIZEX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sycen:
+  description: FE Slit Y Centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:CENTERY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sysize:
+  description: FE Slit Y Size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:SIZEY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+s1_xw:
+  description: BSF slit outboard
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_xr:
+  description: BSF slit inboard
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_yt:
+  description: BSF slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_yb:
+  description: BSF slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_xcen:
+  description: BSF X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_xsize:
+  description: BSF X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_ycen:
+  description: BSF Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_ysize:
+  description: BSF Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+bsf_f1_y:
+  description: BSF Filter 1 Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-FI1:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+bsf_f2_y:
+  description: BSF Filter 2 Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-FI2:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+dcm_bragg:
+  description: DCM Bragg angle
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_x:
+  description: DCM lateral
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_perp:
+  description: DCM Perp
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:TRX-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_pitch:
+  description: DCM 2nd crystal pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+lu_bpm_x:
+  description: BPM2 X translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - lu
+  readOnly: false 
+  softwareTrigger: false
+lu_bpm_y:
+  description: BPM2 Y translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - lu
+  readOnly: false 
+  softwareTrigger: false
+bsc_bpm_x:
+  description: BSC BPM X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_bpm_y:
+  description: BSC BPM Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRY1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f1_x:
+  description: BSC Filter 1 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI1:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f2_x:
+  description: BSC Filter 2 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI2:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f3_x:
+  description: BSC Filter 2 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI3:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f4_x:
+  description: BSC Filter 4 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI4:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xw:
+  description: BSC slit wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xr:
+  description: BSC slit ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xcen:
+  description: BSC slit X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xsize:
+  description: BSC slit X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_yt:
+  description: BSC slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_yb:
+  description: BSC slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_ycen:
+  description: BSC slit Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_ysize:
+  description: BSC slit Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+xeye_x:
+  description: BSC X-ray eye X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+xeye_y:
+  description: BSC X-ray eye Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRY1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+vfm_xu:
+  description: VFM Upstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_xd:
+  description: VFM Downstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_yur:
+  description: VFM Upstream Ring Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_yw:
+  description: VFM Wall Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_ydr:
+  description: VFM Downstream Ring Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_bu:
+  description: VFM Upstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_bd:
+  description: VFM Downstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_yaw:
+  description: VFM Virtual Yaw
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_roll:
+  description: VFM Virtual Roll
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_pitch:
+  description: VFM Virtual Pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_lat:
+  description: VFM Virtual X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_vert:
+  description: VFM Virtual Y 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_xu:
+  description: HFM Upstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_xd:
+  description: HFM Downstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_yuw:
+  description: HFM Upstream Wall Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_yr:
+  description: HFM Ring Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_ydw:
+  description: HFM Downstream Wall Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_bu:
+  description: HFM Upstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_bd:
+  description: HFM Downstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_yaw:
+  description: HFM Virtual Yaw
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_roll:
+  description: HFM Virtual Roll
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_pitch:
+  description: HFM Virtual Pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_lat:
+  description: HFM Virtual X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_vert:
+  description: HFM Virtual Y 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+bcu_bpm_x:
+  description: BCU BPM X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BPM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+bcu_bpm_y:
+  description: BCU BPM Y 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BPM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xw:
+  description: BCU slit wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xr:
+  description: BCU slit ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xcen:
+  description: BCU slit X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xsize:
+  description: BCU slit X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_yt:
+  description: BCU slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_yb:
+  description: BCU slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_ycen:
+  description: BCU slit Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_ysize:
+  description: BCU slit Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+scam_zoom:
+  description: Sample cam zoom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SAMCAM:ZOOM'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - scam
+  readOnly: false 
+  softwareTrigger: false
+coll_y:
+  description: Collimator Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-COL:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+scin_y:
+  description: Scintillator/diode Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SCL:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+scin_z:
+  description: Scintillator/diode Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SCL:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+cryo_x:
+  description: Cryojet X 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-CJ:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+bs_x:
+  description: Beamstop X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BS:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+bs_y:
+  description: Beamstop Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BS:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+bs_z:
+  description: Beamstop Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BS:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+xeye2_focus:
+  description: X-ray eye 2 Focus
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-XEYE:FOCUS'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+xeye2_zoom:
+  description: X-ray eye 2 Zoom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-XEYE:ZOOM'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+xeye2_x:
+  description: X-ray eye 2 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-XEYE:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+det_y:
+  description: Detector Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-DET:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+det_z:
+  description: Detector Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-DET:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
diff --git a/pxii_bec/device_configs/pxii-autogenerated.yaml.bak b/pxii_bec/device_configs/pxii-autogenerated.yaml.bak
new file mode 100644
index 0000000..8fac88e
--- /dev/null
+++ b/pxii_bec/device_configs/pxii-autogenerated.yaml.bak
@@ -0,0 +1,1331 @@
+sls_current:
+  description: SLS current
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - SLS
+  readOnly: true
+  softwareTrigger: false
+fe_bpm1:
+  description: FE XBPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpm2:
+  description: FE XBPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpm3:
+  description: FE XBPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpm4:
+  description: FE XBPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+fe_bpmsum:
+  description: FE XBPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-FE-XBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm1:
+  description: LU BPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm2:
+  description: LU BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm3:
+  description: LU BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm4:
+  description: LU BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpmsum:
+  description: LU BPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm1:
+  description: BSC BPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm2:
+  description: BSC BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm3:
+  description: BSC BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm4:
+  description: BSC BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpmsum:
+  description: BSC BPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_camx:
+  description: BSC camera X
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - cam
+  readOnly: true
+  softwareTrigger: false
+bsc_camy:
+  description: BSC camera Y
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - cam
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm1:
+  description: BCU BPM Signal 1 
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm2:
+  description: BCU BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm3:
+  description: BCU BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpm4:
+  description: BCU BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bcu_bpmsum:
+  description: BCU BPM Summed
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+i1:
+  description: i1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-KBOX_K:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+samcam_x:
+  description: sample cam X 
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:CentroidX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_xsig:
+  description: sample cam X sigma
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:SigmaX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_y:
+  description: sample cam Y 
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:CentroidY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+samcam_ysig:
+  description: sample cam Y sigma
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:SigmaY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - scam
+  readOnly: true
+  softwareTrigger: false
+bsccam_x:
+  description: BSC cam X
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidY_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+bsccam_y:
+  description: BSC cam Y
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidX_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+bsc_cam_exp:
+  description: BSC camera exposure
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:cam1:AcquireTime', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+bsc_cam_gain:
+  description: BSC camera gain
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:cam1:Gain', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bsc
+  readOnly: true
+  softwareTrigger: false
+fe_bpm_x:
+  description: FE BPM X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_bpm_y:
+  description: FE BPM Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxr:
+  description: FE Slit X Ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_syt:
+  description: FE Slit Y top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxw:
+  description: FE Slit X Wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_syb:
+  description: FE SlitY Bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxcen:
+  description: FE Slit X Centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:CENTERX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sxsize:
+  description: FE Slit X Size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:SIZEX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sycen:
+  description: FE Slit Y Centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:CENTERY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+fe_sysize:
+  description: FE Slit Y Size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-FE-SL1:SIZEY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - fe
+  readOnly: false 
+  softwareTrigger: false
+s1_xw:
+  description: BSF slit outboard
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_xr:
+  description: BSF slit inboard
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_yt:
+  description: BSF slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_yb:
+  description: BSF slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_xcen:
+  description: BSF X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_xsize:
+  description: BSF X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_ycen:
+  description: BSF Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+s1_ysize:
+  description: BSF Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-SLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+bsf_f1_y:
+  description: BSF Filter 1 Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-FI1:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+bsf_f2_y:
+  description: BSF Filter 2 Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-FI2:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsf
+  readOnly: false 
+  softwareTrigger: false
+dcm_bragg:
+  description: DCM Bragg angle
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_x:
+  description: DCM lateral
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_perp:
+  description: DCM Perp
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:TRX-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_pitch:
+  description: DCM 2nd crystal pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+lu_bpm_x:
+  description: BPM2 X translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - lu
+  readOnly: false 
+  softwareTrigger: false
+lu_bpm_y:
+  description: BPM2 Y translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - lu
+  readOnly: false 
+  softwareTrigger: false
+bsc_bpm_x:
+  description: BSC BPM X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_bpm_y:
+  description: BSC BPM Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRY1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f1_x:
+  description: BSC Filter 1 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI1:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f2_x:
+  description: BSC Filter 2 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI2:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f3_x:
+  description: BSC Filter 2 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI3:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+bsc_f4_x:
+  description: BSC Filter 4 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSFI4:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xw:
+  description: BSC slit wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xr:
+  description: BSC slit ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xcen:
+  description: BSC slit X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_xsize:
+  description: BSC slit X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSH1:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_yt:
+  description: BSC slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_yb:
+  description: BSC slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_ycen:
+  description: BSC slit Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+s2_ysize:
+  description: BSC slit Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSV1:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+xeye_x:
+  description: BSC X-ray eye X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRX1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+xeye_y:
+  description: BSC X-ray eye Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRY1'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bsc
+  readOnly: false 
+  softwareTrigger: false
+vfm_xu:
+  description: VFM Upstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_xd:
+  description: VFM Downstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_yur:
+  description: VFM Upstream Ring Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_yw:
+  description: VFM Wall Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_ydr:
+  description: VFM Downstream Ring Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_bu:
+  description: VFM Upstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_bd:
+  description: VFM Downstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_yaw:
+  description: VFM Virtual Yaw
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_roll:
+  description: VFM Virtual Roll
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_pitch:
+  description: VFM Virtual Pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_lat:
+  description: VFM Virtual X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+vfm_vert:
+  description: VFM Virtual Y 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_xu:
+  description: HFM Upstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_xd:
+  description: HFM Downstream X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_yuw:
+  description: HFM Upstream Wall Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_yr:
+  description: HFM Ring Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_ydw:
+  description: HFM Downstream Wall Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_bu:
+  description: HFM Upstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_bd:
+  description: HFM Downstream Bender
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_yaw:
+  description: HFM Virtual Yaw
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_roll:
+  description: HFM Virtual Roll
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_pitch:
+  description: HFM Virtual Pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_lat:
+  description: HFM Virtual X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+hfm_vert:
+  description: HFM Virtual Y 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: false 
+  softwareTrigger: false
+bcu_bpm_x:
+  description: BCU BPM X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BPM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+bcu_bpm_y:
+  description: BCU BPM Y 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BPM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xw:
+  description: BCU slit wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xr:
+  description: BCU slit ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xcen:
+  description: BCU slit X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xsize:
+  description: BCU slit X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_yt:
+  description: BCU slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_yb:
+  description: BCU slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_ycen:
+  description: BCU slit Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_ysize:
+  description: BCU slit Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+scam_zoom:
+  description: Sample cam zoom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SAMCAM:ZOOM'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - scam
+  readOnly: false 
+  softwareTrigger: false
+coll_y:
+  description: Collimator Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-COL:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+scin_y:
+  description: Scintillator/diode Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SCL:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+scin_z:
+  description: Scintillator/diode Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SCL:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+cryo_x:
+  description: Cryojet X 
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-CJ:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+bs_x:
+  description: Beamstop X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BS:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+bs_y:
+  description: Beamstop Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BS:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+bs_z:
+  description: Beamstop Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BS:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+xeye2_focus:
+  description: X-ray eye 2 Focus
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-XEYE:FOCUS'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+xeye2_zoom:
+  description: X-ray eye 2 Zoom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-XEYE:ZOOM'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+xeye2_x:
+  description: X-ray eye 2 X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-XEYE:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+det_y:
+  description: Detector Y
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-DET:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
+det_z:
+  description: Detector Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-DET:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - det
+  readOnly: false 
+  softwareTrigger: false
diff --git a/pxii_bec/device_configs/x10sa_device_config.yaml b/pxii_bec/device_configs/x10sa_device_config.yaml
index d28a1af..db42938 100644
--- a/pxii_bec/device_configs/x10sa_device_config.yaml
+++ b/pxii_bec/device_configs/x10sa_device_config.yaml
@@ -1,13 +1,45 @@
 base_config:
-  - !include ./device_config.yaml
-
+  - !include ./pxii-autogenerated.yaml
 id_gap:
   readoutPriority: baseline
   description: undulator gap
   deviceClass: pxii_bec.devices.undulator.UndulatorGap
   deviceConfig:
-    prefix: 'X10SA-UIND:'
+     prefix: 'X10SA-UIND:'
   onFailure: buffer
   enabled: true
   readOnly: false
   softwareTrigger: false
+coll_x:
+  description: Collimator X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-COL:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+dcm_fpitch:
+  description: DCM 2nd crystal fine pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:PITCH-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+   - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_froll:
+  description: DCM 2nd crystal fine roll
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:ROLL-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
\ No newline at end of file
diff --git a/pxii_bec/device_configs/x10sa_device_config_testing.yaml b/pxii_bec/device_configs/x10sa_device_config_testing.yaml
new file mode 100644
index 0000000..85c6592
--- /dev/null
+++ b/pxii_bec/device_configs/x10sa_device_config_testing.yaml
@@ -0,0 +1,99 @@
+base_config:
+  - !include ./pxii-autogenerated.yaml
+id_gap:
+  readoutPriority: baseline
+  description: undulator gap
+  deviceClass: pxii_bec.devices.undulator.UndulatorGap
+  deviceConfig:
+     prefix: 'X10SA-UIND:'
+  onFailure: buffer
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+coll_x:
+  description: Collimator X
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-COL:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: false 
+  softwareTrigger: false
+dcm_fpitch:
+  description: DCM 2nd crystal fine pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:PITCH-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+   - dcm
+  readOnly: false 
+  softwareTrigger: false
+dcm_froll:
+  description: DCM 2nd crystal fine roll
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-DCM:ROLL-C2'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - dcm
+  readOnly: false 
+  softwareTrigger: false
+
+bcu_xasym:
+  description: horizontal asymmetry 
+  deviceClass: ophyd_devices.ComputedSignal
+  deviceConfig:
+    compute_method: "def compute_xasym(signal1, signal2, signal3, signal4):\n    return (signal3.get()+signal4.get() - signal1.get()- signal2.get())/(sum((signal1.get(), signal2.get(), signal3.get(), signal4.get())))"
+    input_signals: 
+      - "bcu_bpm1"
+      - "bcu_bpm2"
+      - "bcu_bpm3"
+      - "bcu_bpm4"
+  enabled: true
+  readOnly: false
+  readoutPriority: baseline
+
+bcu_yasym:
+  description: vertical asymmetry 
+  deviceClass: ophyd_devices.ComputedSignal
+  deviceConfig:
+    compute_method: "def compute_xasym(signal1, signal2, signal3, signal4):\n    return (signal1.get()+signal2.get() - signal3.get()- signal4.get())/(sum((signal1.get(), signal2.get(), signal3.get(), signal4.get())))"
+    input_signals: 
+      - "bcu_bpm1"
+      - "bcu_bpm2"
+      - "bcu_bpm3"
+      - "bcu_bpm4"
+  enabled: true
+  readOnly: false
+  readoutPriority: baseline
+
+bcu_xpos:
+  description: horizontal position
+  deviceClass: ophyd_devices.ComputedSignal
+  deviceConfig:
+    compute_method: "def compute_xpos(signal1):\n    import numpy as np\n    return  0.131786+  np.arctanh((signal1.get()-0.007105) /0.99342) / 9.5597 "
+    input_signals: 
+      - "bcu_xasym"
+  enabled: true
+  readOnly: false
+  readoutPriority: baseline
+
+bcu_ypos:
+  description: vertical position
+  deviceClass: ophyd_devices.ComputedSignal
+  deviceConfig:
+    compute_method: "def compute_ypos(signal1):\n    import numpy as np\n    return -0.20283 +  np.arctanh((signal1.get()- (-0.19936)) /0.80653) / (-13.18539)"
+    input_signals: 
+      - "bcu_yasym"
+  enabled: true
+  readOnly: false
+  readoutPriority: baseline
+
+  
+
+