Automatic backup triggered by new deployment

pxii_bec/bec_ipython_client/startup/post_startup.py

@@ -34,4 +34,8 @@ to setup the prompts.
 """
 
 # pylint: disable=invalid-name, unused-import, import-error, undefined-variable, unused-variable, unused-argument, no-name-in-module
-init_positioned_devices()
+d = init_se_devices()
+states, allow_modifiers = get_states()
+deps = planner_deps()
+planner = StateManager(d, states, allow_modifiers, deps)
+

pxii_bec/device_configs/beamline_states.yaml

@@ -2,7 +2,7 @@ states:
   robot_sample_exchange:
     allow_modifiers: true
     bl_pos: in
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: out
@@ -32,7 +32,7 @@ states:
   data_collection:
     allow_modifiers: true
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: in
@@ -47,7 +47,7 @@ states:
   DC_XRF:
     allow_modifiers: true
 #    bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: in
@@ -62,7 +62,7 @@ states:
   manual_sample_exchange:
     allow_modifiers: true
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: out
     bs_z: safe
     coll_y: park
@@ -76,7 +76,7 @@ states:
 
   beam_visualisation:
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: out
@@ -90,7 +90,7 @@ states:
 
   flux_measurement:
     bl_pos: in
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: out
@@ -104,7 +104,7 @@ states:
 
   beamstop_alignment:
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: samp
     coll_y: out
@@ -119,7 +119,7 @@ states:
   maintenance:
     allow_modifiers: true
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: out
     bs_z: safe
     coll_y: park
@@ -137,7 +137,7 @@ states:
     bl_bright: 'on'
     bs_pos: in
     bs_z: safe
-    coll_y: intermediate
+    coll_y: in #intermediate
     cryo_pos: in
     det_cov: 'close'
     diag_y: out

pxii_bec/device_configs/pxii-devices-new.csv

@@ -87,30 +87,30 @@ ss_xicam_exp,ss camera exposure,Signal,X10SA-ES-SSXI:cam1:AcquireTime,baseline,s
 ss_xicam_gain,ss camera gain,Signal,X10SA-ES-SSXI:cam1:cam1:Gain,baseline,ss,no,no,,
 ss_xicam_xsig,ss camera  x sigma,Signal,X10SA-ES-SSXI:cam1:Stats5:SigmaX_RBV,baseline,ss,yes,no,,
 ss_xicam_ysig,ss camera y sigma,Signal,X10SA-ES-SSXI:cam1:Stats5:SigmaY_RBV,baseline,ss,yes,no,,
-vfm_xu,VFM Upstream X,MotorEC,X10SA-ES-KBV:TRXU,baseline,vfm,no,no,,
-vfm_xd,VFM Downstream X,MotorEC,X10SA-ES-KBV:TRXD,baseline,vfm,no,no,,
-vfm_yur,VFM Upstream Ring Y,MotorEC,X10SA-ES-KBV:TRYUR,baseline,vfm,no,no,,
-vfm_yw,VFM Wall Y,MotorEC,X10SA-ES-KBV:TRYW,baseline,vfm,no,no,,
-vfm_ydr,VFM Downstream Ring Y,MotorEC,X10SA-ES-KBV:TRYDR,baseline,vfm,no,no,,
-vfm_bu,VFM Upstream Bender,MotorEC,X10SA-ES-KBV:BNDU,baseline,vfm,no,no,,
-vfm_bd,VFM Downstream Bender,MotorEC,X10SA-ES-KBV:BNDD,baseline,vfm,no,no,,
-vfm_yaw,VFM Virtual Yaw,MotorEC,X10SA-ES-KBV:YAW,baseline,vfm,no,no,,
-vfm_roll,VFM Virtual Roll,MotorEC,X10SA-ES-KBV:ROLL,baseline,vfm,no,no,,
-vfm_pitch,VFM Virtual Pitch,MotorEC,X10SA-ES-KBV:PITCH,baseline,vfm,no,no,,
-vfm_x,VFM Virtual X,MotorEC,X10SA-ES-KBV:TRX,baseline,vfm,no,no,,
-vfm_y,VFM Virtual Y ,MotorEC,X10SA-ES-KBV:TRY,baseline,vfm,no,no,,
-hfm_xu,HFM Upstream X,MotorEC,X10SA-ES-KBH:TRXU,baseline,hfm,no,no,,
-hfm_xd,HFM Downstream X,MotorEC,X10SA-ES-KBH:TRXD,baseline,hfm,no,no,,
-hfm_yuw,HFM Upstream Wall Y,MotorEC,X10SA-ES-KBH:TRYUW,baseline,hfm,no,no,,
-hfm_yr,HFM Ring Y,MotorEC,X10SA-ES-KBH:TRYR,baseline,hfm,no,no,,
-hfm_ydw,HFM Downstream Wall Y,MotorEC,X10SA-ES-KBH:TRYDW,baseline,hfm,no,no,,
-hfm_bu,HFM Upstream Bender,MotorEC,X10SA-ES-KBH:BNDU,baseline,hfm,no,no,,
-hfm_bd,HFM Downstream Bender,MotorEC,X10SA-ES-KBH:BNDD,baseline,hfm,no,no,,
-hfm_yaw,HFM Virtual Yaw,MotorEC,X10SA-ES-KBH:YAW,baseline,hfm,no,no,,
-hfm_roll,HFM Virtual Roll,MotorEC,X10SA-ES-KBH:ROLL,baseline,hfm,no,no,,
-hfm_pitch,HFM Virtual Pitch,MotorEC,X10SA-ES-KBH:PITCH,baseline,hfm,no,no,,
-hfm_x,HFM Virtual X,MotorEC,X10SA-ES-KBH:TRX,baseline,hfm,no,no,,
-hfm_y,HFM Virtual Y ,MotorEC,X10SA-ES-KBH:TRY,baseline,hfm,no,no,,
+vfm_xu,VFM Upstream X,MotorEC,X10SA-ES-VFM:TRXU,baseline,vfm,no,yes,,
+vfm_xd,VFM Downstream X,MotorEC,X10SA-ES-VFM:TRXD,baseline,vfm,no,yes,,
+vfm_yur,VFM Upstream Ring Y,MotorEC,X10SA-ES-VFM:TRYUR,baseline,vfm,no,yes,,
+vfm_yw,VFM Wall Y,MotorEC,X10SA-ES-VFM:TRYW,baseline,vfm,no,yes,,
+vfm_ydr,VFM Downstream Ring Y,MotorEC,X10SA-ES-VFM:TRYDR,baseline,vfm,no,yes,,
+vfm_bu,VFM Upstream Bender,MotorEC,X10SA-ES-VFM:BNDU,baseline,vfm,no,yes,,
+vfm_bd,VFM Downstream Bender,MotorEC,X10SA-ES-VFM:BNDD,baseline,vfm,no,yes,,
+vfm_yaw,VFM Virtual Yaw,MotorEC,X10SA-ES-VFM:YAW,baseline,vfm,no,yes,,
+vfm_roll,VFM Virtual Roll,MotorEC,X10SA-ES-VFM:ROLL,baseline,vfm,no,yes,,
+vfm_pitch,VFM Virtual Pitch,MotorEC,X10SA-ES-VFM:PITCH,baseline,vfm,no,yes,,
+vfm_x,VFM Virtual X,MotorEC,X10SA-ES-VFM:TRX,baseline,vfm,no,yes,,
+vfm_y,VFM Virtual Y ,MotorEC,X10SA-ES-VFM:TRY,baseline,vfm,no,yes,,
+hfm_xu,HFM Upstream X,MotorEC,X10SA-ES-HFM:TRXU,baseline,hfm,no,yes,,
+hfm_xd,HFM Downstream X,MotorEC,X10SA-ES-HFM:TRXD,baseline,hfm,no,yes,,
+hfm_yuw,HFM Upstream Wall Y,MotorEC,X10SA-ES-HFM:TRYUW,baseline,hfm,no,yes,,
+hfm_yr,HFM Ring Y,MotorEC,X10SA-ES-HFM:TRYR,baseline,hfm,no,yes,,
+hfm_ydw,HFM Downstream Wall Y,MotorEC,X10SA-ES-HFM:TRYDW,baseline,hfm,no,yes,,
+hfm_bu,HFM Upstream Bender,MotorEC,X10SA-ES-HFM:BNDU,baseline,hfm,no,yes,,
+hfm_bd,HFM Downstream Bender,MotorEC,X10SA-ES-HFM:BNDD,baseline,hfm,no,yes,,
+hfm_yaw,HFM Virtual Yaw,MotorEC,X10SA-ES-HFM:YAW,baseline,hfm,no,yes,,
+hfm_roll,HFM Virtual Roll,MotorEC,X10SA-ES-HFM:ROLL,baseline,hfm,no,yes,,
+hfm_pitch,HFM Virtual Pitch,MotorEC,X10SA-ES-HFM:PITCH,baseline,hfm,no,yes,,
+hfm_x,HFM Virtual X,MotorEC,X10SA-ES-HFM:TRX,baseline,hfm,no,yes,,
+hfm_y,HFM Virtual Y ,MotorEC,X10SA-ES-HFM:TRY,baseline,hfm,no,yes,,
 bcu_bpm1,BCU BPM Signal 1 ,SignalRO,X10SA-ES-BCBPM:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
 bcu_bpm2,BCU BPM Signal 2,SignalRO,X10SA-ES-BCBPM:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
 bcu_bpm3,BCU BPM Signal 3,SignalRO,X10SA-ES-BCBPM:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
@@ -118,14 +118,14 @@ bcu_bpm4,BCU BPM Signal 4,SignalRO,X10SA-ES-BCBPM:Current4:MeanValue_RBV,monitor
 bcu_bpmsum,BCU BPM Summed,SignalRO,X10SA-ES-BCBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
 bcu_bpm_x,BCU BPM X,Motor,X10SA-ES-BCBPM:TRX,baseline,bcu,no,yes,,
 bcu_bpm_y,BCU BPM Y ,Motor,X10SA-ES-BCBPM:TRY,baseline,bcu,no,yes,,
-bcu_sl_xw,BCU slit wall,Motor,X10SA-ES-BCSLH:TRXW,baseline,bcu,no,no,,
-bcu_sl_xr,BCU slit ring,Motor,X10SA-ES-BCSLH:TRXR,baseline,bcu,no,no,,
-bcu_sl_xcen,BCU slit X centre,Motor,X10SA-ES-BCSLH:CENTER,baseline,bcu,no,no,,
-bcu_sl_xsize,BCU slit X size,Motor,X10SA-ES-BCSLH:SIZEX,baseline,bcu,no,no,,
-bcu_sl_yt,BCU slit top,Motor,X10SA-ES-BCSLV:TRYT,baseline,bcu,no,no,,
-bcu_sl_yb,BCU slit bottom,Motor,X10SA-ES-BCSLV:TRYB,baseline,bcu,no,no,,
-bcu_sl_ycen,BCU slit Y centre,Motor,X10SA-ES-BCSLV:CENTER,baseline,bcu,no,no,,
-bcu_sl_ysize,BCU slit Y size,Motor,X10SA-ES-BCSLV:SIZE,baseline,bcu,no,no,,
+bcu_sl_xw,BCU slit wall,Motor,X10SA-ES-BCSLH:TRXW,baseline,bcu,no,yes,,
+bcu_sl_xr,BCU slit ring,Motor,X10SA-ES-BCSLH:TRXR,baseline,bcu,no,yes,,
+bcu_sl_xcen,BCU slit X centre,Motor,X10SA-ES-BCSLH:CENTER,baseline,bcu,no,yes,,
+bcu_sl_xsize,BCU slit X size,Motor,X10SA-ES-BCSLH:SIZE,baseline,bcu,no,yes,,
+bcu_sl_yt,BCU slit top,Motor,X10SA-ES-BCSLV:TRYT,baseline,bcu,no,yes,,
+bcu_sl_yb,BCU slit bottom,Motor,X10SA-ES-BCSLV:TRYB,baseline,bcu,no,yes,,
+bcu_sl_ycen,BCU slit Y centre,Motor,X10SA-ES-BCSLV:CENTER,baseline,bcu,no,yes,,
+bcu_sl_ysize,BCU slit Y size,Motor,X10SA-ES-BCSLV:SIZE,baseline,bcu,no,yes,,
 xrf_pos,XRF det in/out,Signal,X10SA-ES-XRF:POS-SET,baseline,se,no,no,"{""type"":positioner}",
 samcam_x,sample cam X ,SignalRO,X10SA-ES-MS:Stats5:CentroidX_RBV,baseline,scam,yes,yes,,
 samcam_xsig,sample cam X sigma,SignalRO,X10SA-ES-MS:Stats5:SigmaX_RBV,monitored,scam,yes,yes,,
@@ -153,6 +153,7 @@ gon_z,Goniometer X,Motor,X10SA-ES-DF1:TRZ1,baseline,det,no,yes,,
 omega,Omega,Motor,X10SA-ES-DF1:ROTU,baseline,det,no,yes,,
 cryo_pos,Cryo positioner,Signal,X10SA-ES-CS:POS-SET,baseline,se,no,no,"{""type"":positioner}",
 cryo_x,Cryojet X ,Motor,X10SA-ES-CS:TRX,baseline,se,no,yes,,
+cryo_temp,Cryojet temperature,Signal,X10SA-ES-CS:TEMP_RBV,baseline,se,no,yes,,
 det_xi_focus,X-ray eye 2 Focus,Motor,X10SA-ES-XEYE:FOCUS,baseline,det,no,yes,,
 det_xi_zoom,X-ray eye 2 Zoom,Motor,X10SA-ES-XEYE:ZOOM,baseline,det,no,yes,,
 det_xi_x,X-ray eye X,Motor,X10SA-ES-XEYE:TRX,baseline,det,no,yes,,

pxii_bec/device_configs/pxii-devices-new.yaml

@@ -863,6 +863,294 @@ ss_xi_y:
   readOnly: False
   softwareTrigger: false
 
+vfm_xu:
+  description: VFM Upstream X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_x:
+  description: VFM Virtual X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_y:
+  description: VFM Virtual Y 
+  deviceClass: ophyd_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  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_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_x:
+  description: HFM Virtual X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_y:
+  description: HFM Virtual Y 
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
 bcu_bpm1:
   description: BCU BPM Signal 1 
   deviceClass: ophyd.EpicsSignalRO
@@ -947,6 +1235,102 @@ bcu_bpm_y:
   readOnly: False
   softwareTrigger: false
 
+bcu_sl_xw:
+  description: BCU slit wall
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_xr:
+  description: BCU slit ring
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_xcen:
+  description: BCU slit X centre
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_xsize:
+  description: BCU slit X size
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_yt:
+  description: BCU slit top
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_yb:
+  description: BCU slit bottom
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_ycen:
+  description: BCU slit Y centre
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_ysize:
+  description: BCU slit Y size
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
 samcam_x:
   description: sample cam X 
   deviceClass: ophyd.EpicsSignalRO
@@ -1151,6 +1535,18 @@ cryo_x:
   readOnly: False
   softwareTrigger: false
 
+cryo_temp:
+  description: Cryojet temperature
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X10SA-ES-CS:TEMP_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: False
+  softwareTrigger: false
+
 det_xi_focus:
   description: X-ray eye 2 Focus
   deviceClass: ophyd_devices.EpicsMotor

pxii_bec/device_configs/se_devices.yaml

@@ -1,6 +1,6 @@
 ss_sl_xw:
   description: SS slit wall
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLH:TRXW'}
   onFailure: buffer
   enabled: True
@@ -16,7 +16,7 @@ ss_sl_xw:
 
 bs_z:
   description: Beamstop Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BS:TRZ'}
   onFailure: buffer
   enabled: True
@@ -36,7 +36,7 @@ bs_z:
 
 gon_x:
   description: Goniometer X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DF1:TRX1'}
   onFailure: buffer
   enabled: True
@@ -54,7 +54,7 @@ gon_x:
 
 diag_y:
   description: Scintillator/diode Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SCL:TRY'}
   onFailure: buffer
   enabled: True
@@ -73,7 +73,7 @@ diag_y:
 
 coll_y:
   description: Collimator Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-COL:TRY'}
   onFailure: buffer
   enabled: True

pxii_bec/macros/check.py

@@ -0,0 +1,62 @@
+from bec_lib.device import Signal, Positioner
+
+def check():
+    check_devices(tolerance = 0.02)
+
+    
+
+def check_devices(tolerance):
+    devices = list(dev.items())
+    for name, obj in devices:
+
+        try:
+            data = obj.read()
+            # deal with smargon
+            if "smargon" in name:
+                continue
+            
+            actual = data[name]["value"]
+
+            # If signal and a camera or bpm, check reading is not 0
+            if isinstance(obj, Signal):
+                if 'cam' in name or 'bpm' in name:
+                    if actual == 0.0:
+                        print(f"{name} is reading 0")    
+
+            # if signal is a motor, check in position, error, moving
+            if isinstance(obj, Positioner):
+                # Check set position = real position
+
+                sp_key = f"{name}_user_setpoint"
+
+                if sp_key not in data:
+                    continue
+
+                setpoint = data[sp_key]["value"]
+
+                diff = abs(actual - setpoint)
+                inpos = diff <= tolerance
+                if not inpos:
+                    print(
+                        f"{name}: "
+                        # f"actual={actual:.4f}, "
+                        # f"setpoint={setpoint:.4f}, "
+                        # f"diff={diff:.4f}, "
+                        f"in position = {inpos}"
+                    )
+                # check if motor is in error state    
+                error_status = obj.motor_status.get()
+
+                if error_status != 0:
+                    print(f"{name}: error_state = {error_status}")
+                
+                # check if motor is moving
+                move_status = obj.motor_is_moving.get()
+                if move_status != 0:
+                    print(f"{name} is moving")
+
+        
+        except Exception as exc:
+
+            print(f"{name}: ERROR -> {exc}")   
+

pxii_bec/macros/policies.py

@@ -54,7 +54,7 @@ def make_diag_y_policy(d):
     def diag_y_policy(target):
         cfg = d["diag_y"].positions
         # Don't move in if the goniometer is >= 'in'
-        if d["gon_x"].actual >= d["gon_x"].positions["in"]:
+        if d["gon_x"].actual >= d["gon_x"].positions["in"] and target > cfg['out']:
             raise GuardViolation(
                 f"Diagnostic device cannot move beyond {cfg['out']} mm when goniometer is not OUT"
             )