Merge pull request 'Update device configs with new ComputedSignals' (#6) from x10sa_production_20251114T104939 into main

Reviewed-on: #6

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

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
+
+  
+
+