fix(bpm): fix input device config for bpm.BPM
This commit is contained in:
@@ -1051,10 +1051,10 @@ bpm_xbox2_slowrb:
|
||||
description: BPM Xbox 2 (First Xbox in ES hutch) readback
|
||||
deviceClass: csaxs_bec.devices.pseudo_devices.bpm.BPM
|
||||
deviceConfig:
|
||||
left_top: galilrioesxbox.analog_in.ch0
|
||||
right_top: galilrioesxbox.analog_in.ch1
|
||||
right_bot: galilrioesxbox.analog_in.ch2
|
||||
left_bot: galilrioesxbox.analog_in.ch3
|
||||
left_top_ref: galilrioesxbox.analog_in.ch0
|
||||
right_top_ref: galilrioesxbox.analog_in.ch1
|
||||
right_bot_ref: galilrioesxbox.analog_in.ch2
|
||||
left_bot_ref: galilrioesxbox.analog_in.ch3
|
||||
enabled: true
|
||||
readoutPriority: monitored
|
||||
onFailure: retry
|
||||
|
||||
@@ -203,10 +203,10 @@ bpm1:
|
||||
description: 'XBPM1 (frontend)'
|
||||
deviceClass: csaxs_bec.devices.pseudo_devices.bpm.BPM
|
||||
deviceConfig:
|
||||
left_top: xbpm1c1
|
||||
right_top: xbpm1c2
|
||||
right_bot: xbpm1c3
|
||||
left_bot: xbpm1c4
|
||||
left_top_ref: xbpm1c1
|
||||
right_top_ref: xbpm1c2
|
||||
right_bot_ref: xbpm1c3
|
||||
left_bot_ref: xbpm1c4
|
||||
onFailure: raise
|
||||
enabled: true
|
||||
readoutPriority: monitored
|
||||
|
||||
@@ -368,10 +368,10 @@ galilrioop:
|
||||
# description: BPM Xbox 1 (OP hutch) readback
|
||||
# deviceClass: csaxs_bec.devices.pseudo_devices.bpm.BPM
|
||||
# deviceConfig:
|
||||
# left_top: galilrioop.analog_in.ch0
|
||||
# right_top: galilrioop.analog_in.ch1
|
||||
# right_bot: galilrioop.analog_in.ch2
|
||||
# left_bot: galilrioop.analog_in.ch3
|
||||
# left_top_ref: galilrioop.analog_in.ch0
|
||||
# right_top_ref: galilrioop.analog_in.ch1
|
||||
# right_bot_ref: galilrioop.analog_in.ch2
|
||||
# left_bot_ref: galilrioop.analog_in.ch3
|
||||
# enabled: true
|
||||
# readoutPriority: monitored
|
||||
# onFailure: retry
|
||||
|
||||
@@ -12,10 +12,10 @@ bpm1:
|
||||
readoutPriority: baseline
|
||||
deviceClass: csaxs_bec.devices.pseudo_devices.bpm.BPM
|
||||
deviceConfig:
|
||||
blade_t: galilrioesxbox.analog_in.ch0
|
||||
blade_r: galilrioesxbox.analog_in.ch1
|
||||
blade_b: galilrioesxbox.analog_in.ch2
|
||||
blade_l: galilrioesxbox.analog_in.ch3
|
||||
left_top_ref: galilrioesxbox.analog_in.ch0
|
||||
right_top_ref: galilrioesxbox.analog_in.ch1
|
||||
right_bot_ref: galilrioesxbox.analog_in.ch2
|
||||
left_bot_ref: galilrioesxbox.analog_in.ch3
|
||||
enabled: true
|
||||
readOnly: false
|
||||
softwareTrigger: true
|
||||
|
||||
@@ -72,10 +72,10 @@ class BPM(PSIPseudoDeviceBase):
|
||||
def __init__(
|
||||
self,
|
||||
name,
|
||||
left_top: str,
|
||||
right_top: str,
|
||||
right_bot: str,
|
||||
left_bot: str,
|
||||
left_top_ref: str,
|
||||
right_top_ref: str,
|
||||
right_bot_ref: str,
|
||||
left_bot_ref: str,
|
||||
device_manager=None,
|
||||
scan_info=None,
|
||||
**kwargs,
|
||||
@@ -83,16 +83,16 @@ class BPM(PSIPseudoDeviceBase):
|
||||
super().__init__(name=name, device_manager=device_manager, scan_info=scan_info, **kwargs)
|
||||
# Get all blade signal objects from utility method
|
||||
signal_t = self.left_top.get_device_object_from_bec(
|
||||
object_name=left_top, signal_name=self.name, device_manager=device_manager
|
||||
object_name=left_top_ref, signal_name=self.name, device_manager=device_manager
|
||||
)
|
||||
signal_r = self.right_top.get_device_object_from_bec(
|
||||
object_name=right_top, signal_name=self.name, device_manager=device_manager
|
||||
object_name=right_top_ref, signal_name=self.name, device_manager=device_manager
|
||||
)
|
||||
signal_b = self.right_bot.get_device_object_from_bec(
|
||||
object_name=right_bot, signal_name=self.name, device_manager=device_manager
|
||||
object_name=right_bot_ref, signal_name=self.name, device_manager=device_manager
|
||||
)
|
||||
signal_l = self.left_bot.get_device_object_from_bec(
|
||||
object_name=left_bot, signal_name=self.name, device_manager=device_manager
|
||||
object_name=left_bot_ref, signal_name=self.name, device_manager=device_manager
|
||||
)
|
||||
|
||||
# Set compute methods for blade signals and virtual signals
|
||||
|
||||
@@ -150,10 +150,10 @@ def bpm(patched_dm_bpm):
|
||||
enabled=True,
|
||||
readoutPriority="baseline",
|
||||
deviceConfig={
|
||||
"left_top": "left_top",
|
||||
"right_top": "right_top",
|
||||
"right_bot": "right_bot",
|
||||
"left_bot": "left_bot",
|
||||
"left_top_ref": "left_top",
|
||||
"right_top_ref": "right_top",
|
||||
"right_bot_ref": "right_bot",
|
||||
"left_bot_ref": "left_bot",
|
||||
},
|
||||
needs=["left_top", "right_top", "right_bot", "left_bot"],
|
||||
)
|
||||
@@ -161,10 +161,10 @@ def bpm(patched_dm_bpm):
|
||||
try:
|
||||
bpm = BPM(
|
||||
name=name,
|
||||
left_top="left_top",
|
||||
right_top="right_top",
|
||||
right_bot="right_bot",
|
||||
left_bot="left_bot",
|
||||
left_top_ref="left_top",
|
||||
right_top_ref="right_top",
|
||||
right_bot_ref="right_bot",
|
||||
left_bot_ref="left_bot",
|
||||
device_manager=patched_dm_bpm,
|
||||
)
|
||||
patched_dm_bpm.devices._add_device(bpm.name, bpm)
|
||||
|
||||
Reference in New Issue
Block a user