fix: set default shape in NDDerivedSignal

bluesky · Jun 5, 2024 · 6d92c3e · 6d92c3e
1 parent 85b6561
commit 6d92c3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ophyd/areadetector/base.py b/ophyd/areadetector/base.py
@@ -24,7 +24,13 @@
 
 from ..device import Component, Device, DynamicDeviceComponent
 from ..ophydobj import Kind, OphydObject
-from ..signal import ArrayAttributeSignal, DerivedSignal, EpicsSignal, EpicsSignalRO
+from ..signal import (
+    ArrayAttributeSignal,
+    DerivedSignal,
+    EpicsSignal,
+    EpicsSignalRO,
+    NumericValueInfo,
+)
 from . import docs
 
 
@@ -92,6 +98,7 @@ def __init__(
         if isinstance(num_dimensions, str):
             num_dimensions = getattr(parent, num_dimensions)
         self._num_dimensions = num_dimensions
+        kwargs.setdefault("value", NumericValueInfo(None, shape))
         super().__init__(derived_from=derived_from, parent=parent, **kwargs)
 
     @property

diff --git a/ophyd/tests/test_areadetector.py b/ophyd/tests/test_areadetector.py
@@ -881,7 +881,7 @@ def test_ndderivedsignal_with_scalars():
     shaped.derived_ndims == 2
     assert shaped.get().shape == (4, 3)
     # Describe returns list
-    assert shaped.describe()[shaped.name]["shape"] == [4, 3]
+    assert shaped.describe()[shaped.name]["shape"] == (4, 3)
     shaped.put(np.ones((4, 3)))
     assert all(sig.get() == np.ones(12))