reducing warnings, simplifying read

tests/test_ClusterReader.py

@@ -2,6 +2,7 @@ import pytest
 import os, sys
 from creader import ClusterFileReader
 from fixtures import data_path
+import numpy as np
 
 def test_references_on_read(data_path):
     fname= (data_path/'beam_En700eV_-40deg_300V_10us_d0_f0_100.clust').as_posix()
@@ -25,4 +26,49 @@ def test_resize_on_read(data_path):
     max_clusters = 10000000 #400MB initial allocation
     clusters = r.read(max_clusters)
     assert clusters.size == 481603
-    assert sys.getrefcount(clusters) == 2
+    assert sys.getrefcount(clusters) == 2
+
+def test_read_file_with_single_frame(data_path):
+    #File shoud contain one frame 135 with 97 clusters
+    fname= (data_path/'single_frame_97_clustrers.clust').as_posix()
+    r = ClusterFileReader(fname)
+    clusters = r.read(100)
+    assert clusters.size == 97
+    for i, c in enumerate(clusters):
+        assert c['x'] == i+1
+        assert c['y'] == i+200
+        assert (c['data'] == np.arange(i*9, (i+1)*9, dtype = np.int32)).all()
+
+def test_read_file_with_single_frame_in_chunks(data_path):
+    #File shoud contain one frame 135 with 97 clusters
+    fname= (data_path/'single_frame_97_clustrers.clust').as_posix()
+    r = ClusterFileReader(fname)
+    # clusters = r.read(5)
+    total_clusters = 0
+    while (clusters:=r.read(5)).size:
+        total_clusters += clusters.size
+    assert total_clusters == 97
+
+
+def test_read_file_with_37_frames(data_path):
+    #File shoud contain 37 frames with 5 clusters each
+    #Full spec in utils/write_test_data.py
+    fname= (data_path/'37frames_with_5_clusters.clust').as_posix()
+    r = ClusterFileReader(fname)
+    clusters = r.read(200)
+    assert clusters.size == 185
+    for i, c in enumerate(clusters):
+        assert c['x'] == i%5+1
+        assert c['y'] == i%5+1
+        assert (c['data'] == np.arange(i%5, (i%5)+9, dtype = np.int32)).all()
+
+def test_read_file_with_37_frames_in_chunks(data_path):
+    #File shoud contain 37 frames with 5 clusters each
+    #Full spec in utils/write_test_data.py
+    fname= (data_path/'37frames_with_5_clusters.clust').as_posix()
+    r = ClusterFileReader(fname)
+    total_clusters = 0
+    while (clusters:=r.read(7)).size:
+        total_clusters += clusters.size
+    assert total_clusters == 185
+