csaxs_bec/device_configs/bl_endstation.yaml

@@ -104,8 +104,8 @@ xbpm3y:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 1
 
-sl3trxi:
-  description: ESbox1 slit 3 inner blade movement
+sl4xi:
+  description: ESbox1 slit 4 inner blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: C
@@ -127,8 +127,8 @@ sl3trxi:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 2
 
-sl3trxo:
-  description: ESbox1 slit 3 outer blade movement
+sl4xo:
+  description: ESbox1 slit 4 outer blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: D
@@ -150,8 +150,8 @@ sl3trxo:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 3
 
-sl3trxb:
-  description: ESbox1 slit 3 bottom blade movement
+sl4yb:
+  description: ESbox1 slit 4 bottom blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: E
@@ -173,8 +173,8 @@ sl3trxb:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 4
 
-sl3trxt:
-  description: ESbox1 slit 3 top blade movement
+sl4yt:
+  description: ESbox1 slit 4 top blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: F
@@ -196,67 +196,67 @@ sl3trxt:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 5
 
-sl3ch:
-  description: ESbox1 slit 3 center horizontal
+sl4xc:
+  description: ESbox1 slit 4 x center 
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitCenter
   deviceConfig:
-    left_slit: sl3trxi
-    right_slit: sl3trxo
+    left_slit: sl4xi
+    right_slit: sl4xo
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl3trxi
-    - sl3trxo
+    - sl4xi
+    - sl4xo
 
 
-sl3wh:
-  description: ESbox1 slit 3 width horizontal
+sl4xs:
+  description: ESbox1 slit 4 x size 
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitWidth
   deviceConfig:
-    left_slit: sl3trxi
-    right_slit: sl3trxo
+    left_slit: sl4xi
+    right_slit: sl4xo
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl3trxi
-    - sl3trxo
+    - sl4xi
+    - sl4xo
 
-sl3cv:
-  description: ESbox1 slit 3 center vertical
+sl4yc:
+  description: ESbox1 slit 4 y center 
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitCenter
   deviceConfig:
-    left_slit: sl3trxb
-    right_slit: sl3trxt
+    left_slit: sl4yb
+    right_slit: sl4yt
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl3trxb
-    - sl3trxt
+    - sl4yb
+    - sl4yt
 
 
-sl3wv:
-  description: ESbox1 slit 3 width vertical
+sl4ys:
+  description: ESbox1 slit 4 y size 
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitWidth
   deviceConfig:
-    left_slit: sl3trxb
-    right_slit: sl3trxt
+    left_slit: sl4yb
+    right_slit: sl4yt
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl3trxb
-    - sl3trxt
+    - sl4yb
+    - sl4yt
 
 fast_shutter_n1_x:
   description: ESbox1 New fast shutter 1 x movment
@@ -420,8 +420,8 @@ filter_array_4_x:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 4
 
-sl4trxi:
-  description: ESbox1 slit 4 inner blade movement
+sl5xi:
+  description: ESbox1 slit 5 inner blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: G
@@ -443,8 +443,8 @@ sl4trxi:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 6
 
-sl4trxo:
-  description: ESbox1 slit 4 outer blade movement
+sl5xo:
+  description: ESbox1 slit 5 outer blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: H
@@ -466,8 +466,8 @@ sl4trxo:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 7
 
-sl4trxb:
-  description: ESbox1 slit 4 bottom blade movement
+sl5yb:
+  description: ESbox1 slit 5 bottom blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: I
@@ -489,8 +489,8 @@ sl4trxb:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 8
 
-sl4trxt:
-  description: ESbox1 slit 4 top blade movement
+sl5yt:
+  description: ESbox1 slit 5 top blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: A
@@ -512,74 +512,74 @@ sl4trxt:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 0
 
-sl4ch:
-  description: ESbox1 slit 4 center horizontal
+sl5xc:
+  description: ESbox1 slit 5 x center 
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitCenter
   deviceConfig:
-    left_slit: sl4trxi
-    right_slit: sl4trxo
+    left_slit: sl5xi
+    right_slit: sl5xo
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl4trxi
-    - sl4trxo
+    - sl5xi
+    - sl5xo
 
 
-sl4wh:
-  description: ESbox1 slit 4 width horizontal
+sl5xs:
+  description: ESbox1 slit 5 x size
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitWidth
   deviceConfig:
-    left_slit: sl4trxi
-    right_slit: sl4trxo
+    left_slit: sl5xi
+    right_slit: sl5xo
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl4trxi
-    - sl4trxo
+    - sl5xi
+    - sl5xo
 
 
-sl4cv:
-  description: ESbox1 slit 4 center vertical
+sl5yc:
+  description: ESbox1 slit 5 y center
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitCenter
   deviceConfig:
-    left_slit: sl4trxb
-    right_slit: sl4trxt
+    left_slit: sl5yb
+    right_slit: sl5yt
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl4trxb
-    - sl4trxt
+    - sl5yb
+    - sl5yt
 
 
-sl4wv:
-  description: ESbox1 slit 4 width vertical
+sl5ys:
+  description: ESbox1 slit 5 y size
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitWidth
   deviceConfig:
-    left_slit: sl4trxb
-    right_slit: sl4trxt
+    left_slit: sl5yb
+    right_slit: sl5yt
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl4trxb
-    - sl4trxt
+    - sl5yb
+    - sl5yt
 
 
 ############## XBOX 3 (XBOX 2 ES) #####################
 
-sl5trxi:
-  description: ESbox2 slit 5 inner blade movement
+sl6xi:
+  description: ESbox2 slit 6 inner blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: C
@@ -601,8 +601,8 @@ sl5trxi:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 2
 
-sl5trxo:
-  description: ESbox2 slit 5 outer blade movement
+sl6xo:
+  description: ESbox2 slit 6 outer blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: D
@@ -624,8 +624,8 @@ sl5trxo:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 3
 
-sl5trxb:
-  description: ESbox2 slit 5 bottom blade movement
+sl6yb:
+  description: ESbox2 slit 6 bottom blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: E
@@ -647,8 +647,8 @@ sl5trxb:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 4
 
-sl5trxt:
-  description: ESbox1 slit 5 top blade movement
+sl6yt:
+  description: ESbox1 slit 6 top blade movement
   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
   deviceConfig:
     axis_Id: F
@@ -670,65 +670,65 @@ sl5trxt:
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 5
 
-sl5ch:
-  description: ESbox1 slit 5 center horizontal
+sl6xc:
+  description: ESbox1 slit 6 x center 
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitCenter
   deviceConfig:
-    left_slit: sl5trxi
-    right_slit: sl5trxo
+    left_slit: sl6xi
+    right_slit: sl6xo
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl5trxi
-    - sl5trxo
+    - sl6xi
+    - sl6xo
 
-sl5wh:
-  description: ESbox1 slit 5 width horizontal
+sl6xs:
+  description: ESbox1 slit 6 x size
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitWidth
   deviceConfig:
-    left_slit: sl5trxi
-    right_slit: sl5trxo
+    left_slit: sl6xi
+    right_slit: sl6xo
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl5trxi
-    - sl5trxo
+    - sl6xi
+    - sl6xo
 
-sl5cv:
-  description: ESbox1 slit 5 center vertical
+sl6yc:
+  description: ESbox1 slit 6 y center
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitCenter
   deviceConfig:
-    left_slit: sl5trxb
-    right_slit: sl5trxt
+    left_slit: sl6yb
+    right_slit: sl6yt
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl5trxb
-    - sl5trxt
+    - sl6yb
+    - sl6yt
 
-sl5wv:
-  description: ESbox1 slit 5 width vertical
+sl6ys:
+  description: ESbox1 slit 6 y size
   deviceClass: ophyd_devices.devices.virtual_slit.VirtualSlitWidth
   deviceConfig:
-    left_slit: sl5trxb
-    right_slit: sl5trxt
+    left_slit: sl6yb
+    right_slit: sl6yt
     offset: 0
   enabled: true
   onFailure: retry
   readOnly: false
   readoutPriority: baseline
   needs:
-    - sl5trxb
-    - sl5trxt
+    - sl6yb
+    - sl6yt
 
 xbimtrx:
   description: ESbox2 beam intensity monitor x movement

csaxs_bec/device_configs/bl_frontend.yaml

@@ -37,7 +37,7 @@ xbpm1y:
   - cSAXS
   - frontend
 
-sl1xr:
+sl1xi:
   description: 'slit 1 (frontend) x ring'
   deviceClass: ophyd.EpicsMotor
   deviceConfig: 
@@ -51,7 +51,7 @@ sl1xr:
   - cSAXS
   - frontend
 
-sl1xw:
+sl1xo:
   description: 'slit 1 (frontend) x wall'
   deviceClass: ophyd.EpicsMotor
   deviceConfig: 

csaxs_bec/device_configs/bl_optics_hutch.yaml

@@ -1,3 +1,115 @@
+sl2xi:
+  description: 'slit 1 (optics) x ring'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:TRXR'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2xo:
+  description: 'slit 1 (optics) x wall'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:TRXW'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2yb:
+  description: 'slit 1 (optics) y bottom'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:TRYB'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2yt:
+  description: 'slit 1 (optics) y top'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:TRYT'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2xc:
+  description: 'slit 1 (optics) x center'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:CENTERX'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2xs:
+  description: 'slit 1 (optics) x size'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:SIZEX'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2yc:
+  description: 'slit 1 (optics) y center'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:CENTERY'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl2ys:
+  description: 'slit 1 (optics) y size'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL1:SIZEY'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
 dmmroty:
   description: 'Double Multilayer Monochromator rotation Y'
   deviceClass: ophyd.EpicsMotor
@@ -283,3 +395,114 @@ poly:
 #   needs:
 #     - galilrioop
 
+sl3xi:
+  description: 'slit 2 (optics) x ring'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:TRXR'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3xo:
+  description: 'slit 2 (optics) x wall'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:TRXW'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3yb:
+  description: 'slit 2 (optics) y bottom'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:TRYB'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3yt:
+  description: 'slit 2 (optics) y top'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:TRYT'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3xc:
+  description: 'slit 2 (optics) x center'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:CENTERX'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3xs:
+  description: 'slit 2 (optics) x size'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:SIZEX'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3yc:
+  description: 'slit 2 (optics) y center'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:CENTERY'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics
+
+sl3ys:
+  description: 'slit 2 (optics) y size'
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: 
+    prefix: 'X12SA-OP-SL2:SIZEY'
+  onFailure: raise
+  enabled: true
+  readoutPriority: baseline
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+  - cSAXS
+  - optics