changed config file

pxiii_bec/device_configs/x06da_device_config.yaml

@@ -1,12 +1,11 @@
 sls_current:
-  description: 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:
-    - ring
     - fe
   readOnly: true
   softwareTrigger: false
@@ -37,7 +36,7 @@ abs_press:
 sldi_cenx:
   description: FE slit-diaphragm horizontal center
   deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENX'}
+  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERX'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -59,7 +58,7 @@ sldi_sizex:
 sldi_ceny:
   description: FE slit-diaphragm vertical center
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENY'}
+  deviceConfig: {prefix: 'X06DA-FE-SLDI:CENTERY'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -79,6 +78,50 @@ sldi_sizey:
   readOnly: false
   softwareTrigger: false
 
+fecmi_try:
+  description: FE collimating mirror try
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-MI1:TRY'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+fecmi_pitch:
+  description: FE collimating mirror pitch
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-MI1:PITCH'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+fecmi_bend:
+  description: FE collimating mirror bend
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-FE-MI1:BEND1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  deviceTags:
+    - fe
+  readOnly: false
+  softwareTrigger: false
+
+slh_press:
+  description: OP slit pressure
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-OP-SLH-VMFR-1010:PRESSURE', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+
 slh_trxr:
   description: OP slit inner blade motion
   deviceClass: ophyd.EpicsMotor
@@ -115,8 +158,17 @@ dccm_theta1:
   readoutPriority: monitored
   readOnly: false
   softwareTrigger: false
-dccm_diode:
+dccm_diode_top:
-  description: Diode between mono crystals
+  description: Top diode between mono crystals
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X06DA-OP-XPM1:TOP:READOUT', auto_monitor: true}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: true
+  softwareTrigger: false
+dccm_diode_bottom:
+  description: Bottom diode between mono crystals
   deviceClass: ophyd.EpicsSignalRO
   deviceConfig: {read_pv: 'X06DA-OP-XPM1:BOT:READOUT', auto_monitor: true}
   onFailure: buffer
@@ -589,24 +641,7 @@ backlight:
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
-det_y:
+
-  description: Pilatus height
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-DET:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-det_z:
-  description: Pilatus translation
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-DET:TRZ1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
 
 
 
@@ -701,3 +736,22 @@ phi:
   readoutPriority: monitored
   readOnly: false
   softwareTrigger: false
+
+det_y:
+  description: Pilatus height
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-DET:TRY1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false
+det_z:
+  description: Pilatus translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X06DA-ES-DET:TRZ1'}
+  onFailure: buffer
+  enabled: true
+  readoutPriority: monitored
+  readOnly: false
+  softwareTrigger: false

pxiii_bec/scripts/beamlinescripts.py

@@ -2,6 +2,8 @@
 # import bec
 # import bec_lib.devicemanager.DeviceContainer as dev
 
+import time
+
 
 def rock(steps, exp_time, scan_start=None, scan_end=None, datasource=None, visual=True, **kwargs):
     """Demo step scan with plotting
@@ -67,3 +69,10 @@ def rock(steps, exp_time, scan_start=None, scan_end=None, datasource=None, visua
     # TODO: Move to fitted maximum
 
     return s, firt_par
+
+
+def monitor(device,steps,t=1):  
+    for _ in range(steps):
+        print(device.read())
+        time.sleep(t)
+