Skip to content

Commit bf22b2a

Browse files
authored
Merge branch 'master' into fix-time-blackrock
2 parents fc998f8 + 5df3403 commit bf22b2a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

doc/source/governance.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ The current maintainers are:
3838
- Julia Sprenger (`@JuliaSprenger`_)
3939
- Michael Denker (`@mdenker`_)
4040
- Alessio Buccino (`@alejoe91`_)
41+
- Zach McKenzie (`@zm711`_)
4142

4243

4344
.. _`Neo maintainers team`: https://github.com/orgs/NeuralEnsemble/teams/neo-maintainers
@@ -47,3 +48,4 @@ The current maintainers are:
4748
.. _`@JuliaSprenger`: https://github.com/JuliaSprenger
4849
.. _`@mdenker`: https://github.com/mdenker
4950
.. _`@alejoe91`: https://github.com/alejoe91
51+
.. _`@zm711`: https://github.com/zm711

neo/rawio/blackrockrawio.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,10 @@ def __read_nev_data(self, nev_data_masks, nev_data_types):
12541254
# read all raw data packets and markers
12551255
dt0 = [("timestamp", ts_format), ("packet_id", "uint16"), ("value", f"S{data_size - header_skip}")]
12561256

1257-
# expected number of data packets
1257+
# expected number of data packets. We are not sure why, but it seems we can get partial data packets
1258+
# based on blackrock's own code this is okay so applying an int to round down is necessary to obtain the
1259+
# memory map of full packets and toss the partial packet.
1260+
# See reference: https://github.com/BlackrockNeurotech/Python-Utilities/blob/fa75aa671680306788e10d3d8dd625f9da4ea4f6/brpylib/brpylib.py#L580-L587
12581261
n_packets = int(
12591262
(self.__get_file_size(filename) - header_size) / data_size
12601263
)

0 commit comments

Comments
 (0)