Skip to content

Commit 9fd9ef1

Browse files
authored
Merge pull request #1612 from zm711/plexon-overflow-2-fix
Fix another Plexon overflow + Limit Doc build to NumPy < 2.0 while we finish updating individual IOs
2 parents 830c461 + 2a70edb commit 9fd9ef1

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
@@ -209,7 +209,9 @@ def _parse_header(self):
209209
for index, pos in enumerate(positions):
210210
bl_header = data[pos : pos + 16].view(DataBlockHeader)[0]
211211

212-
timestamp = bl_header["UpperByteOf5ByteTimestamp"] * 2**32 + bl_header["TimeStamp"]
212+
current_upper_byte_of_5_byte_timestamp = int(bl_header["UpperByteOf5ByteTimestamp"])
213+
current_bl_timestamp = int(bl_header["TimeStamp"])
214+
timestamp = current_upper_byte_of_5_byte_timestamp * 2**32 + current_bl_timestamp
213215
n1 = bl_header["NumberOfWaveforms"]
214216
n2 = bl_header["NumberOfWordsInWaveform"]
215217
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)