Merge pull request #251 from EIT-ALIVE/081_fix_event_on_first_frame_p…

…somhorst

Add check for event on first frame

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - develop
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
@@ -12,6 +13,7 @@ on:
       - "**.ipynb"
     branches:
       - main
+      - develop
 
 jobs:
   build:

.github/workflows/cffconvert.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - develop
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     branches:
       - main
+      - develop
 
 jobs:
   verify:

.github/workflows/dash_actions.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - develop
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
@@ -12,6 +13,7 @@ on:
       - "**.ipynb"
     branches:
       - main
+      - develop
 
 jobs:
   call-build-workflow:

.github/workflows/lint.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - develop
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
@@ -12,6 +13,7 @@ on:
       - "**.ipynb"
     branches:
       - main
+      - develop
 
 jobs:
   lint:

eitprocessing/datahandling/loading/draeger.py

@@ -233,7 +233,7 @@ def _read_frame(
     # The event marker stays the same until the next event occurs.
     # Therefore, check whether the event marker has changed with
     # respect to the most recent event. If so, create a new event.
-    if (previous_marker is not None) and (event_marker > previous_marker):
+    if ((previous_marker is not None) and (event_marker > previous_marker)) or (index == 0 and event_text):
         events.append((frame_time, Event(event_marker, event_text)))
     if timing_error:
         warnings.warn("A timing error was encountered during loading.")

tests/conftest.py

@@ -12,10 +12,11 @@
     Path.resolve(Path(__file__).parent.parent),
 )
 data_directory = Path(environment) / "tests" / "test_data"
-draeger_file1 = Path(data_directory) / "Draeger_Test3.bin"
-draeger_file2 = Path(data_directory) / "Draeger_Test.bin"
-timpel_file = Path(data_directory) / "Timpel_test.txt"
-dummy_file = Path(data_directory) / "not_a_file.dummy"
+draeger_file1 = data_directory / "Draeger_Test3.bin"
+draeger_file2 = data_directory / "Draeger_Test.bin"
+draeger_file3 = data_directory / "Draeger_Test_event_on_first_frame.bin"
+timpel_file = data_directory / "Timpel_test.txt"
+dummy_file = data_directory / "not_a_file.dummy"
 
 
 @pytest.fixture(scope="session")

tests/test_loading.py

@@ -2,8 +2,9 @@
 
 from eitprocessing.datahandling.eitdata import EITData, Vendor
 from eitprocessing.datahandling.loading import load_eit_data
+from eitprocessing.datahandling.loading.draeger import DRAEGER_FRAMERATE
 from eitprocessing.datahandling.sequence import Sequence
-from tests.conftest import draeger_file1, draeger_file2, dummy_file, timpel_file
+from tests.conftest import draeger_file1, draeger_file2, draeger_file3, dummy_file, timpel_file
 
 # ruff: noqa: ERA001  #TODO: remove this line
 
@@ -105,9 +106,26 @@ def test_load_partial(
 
 
 def test_illegal_first_frame():
-    for ff in [0.5, -1, "fdw"]:
+    for ff in [0.5, -1, "fdw", 1e12]:
         with pytest.raises((TypeError, ValueError)):
             _ = load_eit_data(draeger_file1, "draeger", first_frame=ff)
 
     for ff2 in [0, 0.0, 1.0, None]:
         _ = load_eit_data(draeger_file1, "draeger", first_frame=ff2)
+
+
+def test_max_frames_too_large():
+    with pytest.warns():
+        _ = load_eit_data(draeger_file1, "draeger", max_frames=1e12)
+
+
+def test_framerate_unset():
+    loaded_draeger = load_eit_data(draeger_file1, "draeger", framerate=None)
+    assert loaded_draeger.eit_data["raw"].framerate == DRAEGER_FRAMERATE
+
+
+def test_event_on_first_frame(draeger2: Sequence):
+    draeger3 = load_eit_data(draeger_file3, vendor="draeger")
+    draeger3_events = draeger3.sparse_data["events_(draeger)"]
+    assert draeger3_events == draeger2.sparse_data["events_(draeger)"]
+    assert draeger3_events.time[0] == draeger3.eit_data["raw"].time[0]