Naming convention updates for OP

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

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'}