Merge branch 'main' into dev/strixels/remap

.gitea/workflows/rh8-local.yml

@@ -25,6 +25,6 @@ jobs:
             make -j 2 
 
       - name: Deploy to NFS update server
-        if: gitea.ref == 'refs/heads/developer'
+        if: gitea.ref == 'refs/heads/main'
         run: |
             sftp -r gitea_runner@mpc2935:/aare/RH8 <<< $'put build/aare'

.gitea/workflows/rh9-local.yml

@@ -22,6 +22,6 @@ jobs:
             make -j 2 
 
       - name: Deploy to NFS update server
-        if: gitea.ref == 'refs/heads/developer'
+        if: gitea.ref == 'refs/heads/main'
         run: |
             sftp -r gitea_runner@mpc2935:/aare/RH9 <<< $'put build/aare'

python/tests/test_RawFile.py

@@ -17,6 +17,7 @@ def test_read_rawfile_with_roi_spanning_over_one_module(test_data_path):
         assert headers.size == 10100
         assert frames.shape == (10100, 256, 256) 
 
+
 @pytest.mark.withdata
 def test_read_rawfile_with_multiple_rois(test_data_path): 
     with RawFile(test_data_path / "raw/ROITestData/MultipleROIs/run_master_0.json") as f:
@@ -27,7 +28,7 @@ def test_read_rawfile_with_multiple_rois(test_data_path):
             f.read_frame()
 
         assert f.tell() == 0
-        frames = f.read_ROIs() 
+        _, frames = f.read_rois() 
         assert num_rois == 2
         assert len(frames) == 2
         assert frames[0].shape == (301, 101)
@@ -36,15 +37,16 @@ def test_read_rawfile_with_multiple_rois(test_data_path):
         assert f.tell() == 1
 
         # read multiple ROIs at once
-        frames = f.read_n_ROIs(2, 1) 
+        _, frames = f.read_n_with_roi(2, roi_index = 1) 
         assert frames.shape == (2, 101, 101)
 
         assert f.tell() == 3
 
+        f.seek(1)
+
         # read specific ROI
-        frame = f.read_ROIs(1, 0)
-        assert len(frame) == 1
-        assert frame[0].shape == (301, 101)
+        _, frame = f.read_roi(0)
+        assert frame.shape == (301, 101)
         assert f.tell() == 2