Make pvi aware of DeviceVectors

bluesky · Oct 25, 2024 · 6eeedd7 · 6eeedd7
1 parent 23bb1de
commit 6eeedd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ophyd_async/epics/core/_pvi_connector.py b/src/ophyd_async/epics/core/_pvi_connector.py
@@ -54,11 +54,11 @@ def create_children_from_annotations(self, device: Device):
 
     def _fill_child(self, name: str, entry: Entry, vector_index: int | None = None):
         if set(entry) == {"d"}:
-            connector = self.filler.fill_child_device(name)
+            connector = self.filler.fill_child_device(name, vector_index=vector_index)
             connector.pvi_pv = entry["d"]
         else:
             signal_type, read_pv, write_pv = _get_signal_details(entry)
-            backend = self.filler.fill_child_signal(name, signal_type)
+            backend = self.filler.fill_child_signal(name, signal_type, vector_index)
             backend.read_pv = read_pv
             backend.write_pv = write_pv
 

diff --git a/tests/fastcs/panda/test_panda_connect.py b/tests/fastcs/panda/test_panda_connect.py
@@ -122,8 +122,9 @@ async def test_panda_with_missing_blocks(panda_pva, panda_t):
     with pytest.raises(
         RuntimeError,
         match=re.escape(
-            "mypanda: cannot provision ['pcap'] from PANDAQSRVI:PVI: {'pulse1': "
-            "{'d': 'PANDAQSRVI:PULSE1:PVI'}, 'seq1': {'d': 'PANDAQSRVI:SEQ1:PVI'}}"
+            "mypanda: cannot provision ['pcap'] from PANDAQSRVI:PVI: "
+            "{'pulse': [None, {'d': 'PANDAQSRVI:PULSE1:PVI'}],"
+            " 'seq': [None, {'d': 'PANDAQSRVI:SEQ1:PVI'}]}"
         ),
     ):
         await panda.connect()