Final edits for different sfreq types

libbids/instruments/eeg_instrument.py

@@ -104,9 +104,9 @@ def device_init_read(self):
         """Initializes reading on the device"""
         if isinstance(self.init_read_fn, Callable):
             self.init_read_fn()
-
-        fn, args, kwargs = cast(Tuple, self.init_read_fn)
-        self.device.__getattribute__(fn)(*args, **kwargs)
+        else:
+            fn, args, kwargs = cast(Tuple, self.init_read_fn)
+            self.device.__getattribute__(fn)(*args, **kwargs)
 
     def device_read(self) -> Union[np.ndarray, List]:
         """read data from the device
@@ -128,7 +128,7 @@ def flush(self) -> None:
         """Read data from the device simply to discard"""
         self.device_read()
 
-    def read(self, remainder: bool = False) -> np.ndarray:
+    def read(self, remainder: bool = False) -> Union[List, np.ndarray]:
         """Read data from the headset and return the data
 
         Parameters
@@ -158,13 +158,14 @@ def read(self, remainder: bool = False) -> np.ndarray:
                 self.writer.writeSamples(
                     np.ascontiguousarray(writebuf), digital=self.is_digital
                 )
+            return samples
         else:
-            periods: List = [int(f) * self.record_duration for f in self.sfreqs]
+            periods: List[int] = [int(f * self.record_duration) for f in self.sfreqs]
             ch_samples: List = cast(List, self.device_read())
             assert len(ch_samples) == len(
                 self.sfreqs
             ), "Data must be the same length as the number sfreqs"
-            self.buffers = [np.c_[i, j] for i, j in zip(self.buffers, ch_samples)]
+            self.buffers = [np.r_[i, j] for i, j in zip(self.buffers, ch_samples)]
             period_met: np.bool_ = np.all(
                 [i.shape[0] >= j for i, j in zip(self.buffers, periods)]
             )
@@ -176,8 +177,7 @@ def read(self, remainder: bool = False) -> np.ndarray:
             elif remainder and has_data:
                 writebufs = [i[:j] for i, j in zip(self.buffers, periods)]
                 self.writer.writeSamples(writebufs, digital=self.is_digital)
-
-        return samples
+            return ch_samples
 
     def start(self, task: str, run_id: str):
         """Begin recording a run

libbids/instruments/ieeg_instrument.py

@@ -105,9 +105,9 @@ def device_init_read(self):
         """Initializes reading on the device"""
         if isinstance(self.init_read_fn, Callable):
             self.init_read_fn()
-
-        fn, args, kwargs = cast(Tuple, self.init_read_fn)
-        self.device.__getattribute__(fn)(*args, **kwargs)
+        else:
+            fn, args, kwargs = cast(Tuple, self.init_read_fn)
+            self.device.__getattribute__(fn)(*args, **kwargs)
 
     def device_read(self) -> Union[np.ndarray, List]:
         """read data from the device
@@ -129,7 +129,7 @@ def flush(self) -> None:
         """Read data from the device simply to discard"""
         self.device_read()
 
-    def read(self, remainder: bool = False) -> np.ndarray:
+    def read(self, remainder: bool = False) -> Union[List, np.ndarray]:
         """Read data from the headset and return the data
 
         Parameters
@@ -159,13 +159,14 @@ def read(self, remainder: bool = False) -> np.ndarray:
                 self.writer.writeSamples(
                     np.ascontiguousarray(writebuf), digital=self.is_digital
                 )
+            return samples
         else:
-            periods: List = [int(f) * self.record_duration for f in self.sfreqs]
+            periods: List[int] = [int(f * self.record_duration) for f in self.sfreqs]
             ch_samples: List = cast(List, self.device_read())
             assert len(ch_samples) == len(
                 self.sfreqs
             ), "Data must be the same length as the number sfreqs"
-            self.buffers = [np.c_[i, j] for i, j in zip(self.buffers, ch_samples)]
+            self.buffers = [np.r_[i, j] for i, j in zip(self.buffers, ch_samples)]
             period_met: np.bool_ = np.all(
                 [i.shape[0] >= j for i, j in zip(self.buffers, periods)]
             )
@@ -177,8 +178,7 @@ def read(self, remainder: bool = False) -> np.ndarray:
             elif remainder and has_data:
                 writebufs = [i[:j] for i, j in zip(self.buffers, periods)]
                 self.writer.writeSamples(writebufs, digital=self.is_digital)
-
-        return samples
+            return ch_samples
 
     def start(self, task: str, run_id: str):
         """Begin recording a run

libbids/instruments/instrument.py

@@ -1,7 +1,7 @@
 """Instrument for stimulating or recording"""
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Optional, TYPE_CHECKING, Union, cast
+from typing import List, Optional, TYPE_CHECKING, Union, cast
 
 from ..enums import Modality
 
@@ -60,7 +60,7 @@ def __init__(
         self.task_id: str = ""
         self.run_id: str = ""
         self._started: bool = False
-        self.sfreq: int
+        self.sfreqs: List[int]
 
     @abstractmethod
     def start(self, task_id: str, run_id: str):

libbids/instruments/read_instrument.py

@@ -1,5 +1,6 @@
 import numpy as np
 from abc import abstractmethod
+from typing import List, Union
 
 from .instrument import Instrument
 
@@ -14,7 +15,7 @@ def flush(self) -> None:
         raise Exception("Method not implemented")
 
     @abstractmethod
-    def read(self, remainder: bool = False) -> np.ndarray:
+    def read(self, remainder: bool = False) -> Union[List, np.ndarray]:
         """Read data from the headset and return the data
 
         Parameters

libbids/run.py

@@ -171,7 +171,7 @@ def prefix(self) -> str:
 
     @property
     def sfreq(self) -> int:
-        return self.task.primary_instrument.sfreq
+        return self.task.primary_instrument.sfreqs[0]
 
     @property
     def subject_dir(self) -> Path: