Skip to content

Commit c6b235d

Browse files
authored
Merge branch 'master' into fix_overflow_2.0
2 parents 682bf76 + 9fd9ef1 commit c6b235d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

neo/rawio/plexonrawio.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ def _parse_header(self):
213213
np_scalar_to_python_scalar = lambda x: x.item() if isinstance(x, np.generic) else x
214214
bl_header = {key: np_scalar_to_python_scalar(bl_header[key]) for key in bl_header.dtype.names}
215215

216-
timestamp = bl_header["UpperByteOf5ByteTimestamp"] * 2**32 + bl_header["TimeStamp"]
216+
current_upper_byte_of_5_byte_timestamp = int(bl_header["UpperByteOf5ByteTimestamp"])
217+
current_bl_timestamp = int(bl_header["TimeStamp"])
218+
timestamp = current_upper_byte_of_5_byte_timestamp * 2**32 + current_bl_timestamp
217219
n1 = bl_header["NumberOfWaveforms"]
218220
n2 = bl_header["NumberOfWordsInWaveform"]
219221
sample_count = n1 * n2

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ docs = [
8080
"matplotlib",
8181
"nixio",
8282
"pynwb",
83-
"igor2"
83+
"igor2",
84+
"numpy<2.0" # https://github.com/NeuralEnsemble/python-neo/pull/1612
8485
]
8586

8687
dev = [

0 commit comments

Comments
 (0)