fix: fixed parsing of ophyd-compatible signal data

This commit is contained in:
2024-05-07 14:39:15 +02:00
parent 8bee809417
commit 8fa72385ae
2 changed files with 8 additions and 3 deletions

View File

@@ -159,7 +159,7 @@ class NIDAQWriterService(BECService):
signals = {}
for key in msgs[0].content["signals"]:
signals[key] = np.concatenate([msg.content["signals"][key] for msg in msgs])
signals[key] = np.concatenate([msg.content["signals"][key]["value"] for msg in msgs])
# write data to queue
self.queue.put(signals)

View File

@@ -95,9 +95,14 @@ def test_nidaq_handle_scan_status(nidaq, scan_status):
def test_nidaq_handle_ni_data(nidaq):
data = [
messages.DeviceMessage(signals={"signal1": list(range(10)), "signal2": list(range(10))}),
messages.DeviceMessage(
signals={"signal1": list(range(10, 20)), "signal2": list(range(10, 20))}
signals={"signal1": {"value": list(range(10))}, "signal2": {"value": list(range(10))}}
),
messages.DeviceMessage(
signals={
"signal1": {"value": list(range(10, 20))},
"signal2": {"value": list(range(10, 20))},
}
),
]