Deserialising ADAr populates the dimensions field (#90)

Author: mattclarke

streaming_data_types/_version.py

@@ -1,4 +1,4 @@
 # Version is not directly defined in __init__ because that causes all
 # run time dependencies to become build-time dependencies when it is
 # imported in setup.py
-version = "0.22.1"
+version = "0.23.0"

streaming_data_types/area_detector_ADAr.py

@@ -130,6 +130,7 @@ def serialise_ADAr(
         ("source_name", str),
         ("unique_id", int),
         ("timestamp", datetime),
+        ("dimensions", np.ndarray),
         ("data", np.ndarray),
         ("attributes", List[Attribute]),
     ),
@@ -200,6 +201,7 @@ def deserialise_ADAr(buffer: Union[bytearray, bytes]) -> ADArray:
         source_name=ad_array.SourceName().decode(),
         unique_id=unique_id,
         timestamp=datetime.fromtimestamp(used_timestamp, tz=timezone.utc),
+        dimensions=ad_array.DimensionsAsNumpy(),
         data=data,
         attributes=attributes_list,
     )

tests/test_ADAr.py

@@ -36,6 +36,8 @@ def test_serialises_and_deserialises_ADAr_int_array(self):
         assert entry.unique_id == original_entry["unique_id"]
         assert entry.source_name == original_entry["source_name"]
         assert entry.timestamp == original_entry["timestamp"]
+        assert np.array_equal(entry.dimensions, original_entry["data"].shape)
+        assert np.array_equal(entry.data.shape, entry.dimensions)  # Sanity check
         assert np.array_equal(entry.data, original_entry["data"])
         assert entry.data.dtype == original_entry["data"].dtype
         assert len(entry.attributes) == len(original_entry["attributes"])