Skip to content
Snippets Groups Projects
Unverified Commit 129da571 authored by Zach McKenzie's avatar Zach McKenzie Committed by GitHub
Browse files

Merge pull request #1690 from luiztauffer/fix-blackrock-overflow

Blackrock rawio fix overflow
parents 008cbe87 96041838
No related branches found
No related tags found
No related merge requests found
...@@ -1058,8 +1058,8 @@ class BlackrockRawIO(BaseRawIO): ...@@ -1058,8 +1058,8 @@ class BlackrockRawIO(BaseRawIO):
filename = ".".join([self._filenames["nsx"], f"ns{nsx_nb}"]) filename = ".".join([self._filenames["nsx"], f"ns{nsx_nb}"])
# get shape of data # get shape of data
shape = (self.__nsx_params["2.1"](nsx_nb)["nb_data_points"], self.__nsx_basic_header[nsx_nb]["channel_count"]) shape = (int(self.__nsx_params["2.1"](nsx_nb)["nb_data_points"]), int(self.__nsx_basic_header[nsx_nb]["channel_count"]))
offset = self.__nsx_params["2.1"](nsx_nb)["bytes_in_headers"] offset = int(self.__nsx_params["2.1"](nsx_nb)["bytes_in_headers"])
# read nsx data # read nsx data
# store as dict for compatibility with higher file specs # store as dict for compatibility with higher file specs
...@@ -1078,10 +1078,10 @@ class BlackrockRawIO(BaseRawIO): ...@@ -1078,10 +1078,10 @@ class BlackrockRawIO(BaseRawIO):
for data_bl in self.__nsx_data_header[nsx_nb].keys(): for data_bl in self.__nsx_data_header[nsx_nb].keys():
# get shape and offset of data # get shape and offset of data
shape = ( shape = (
self.__nsx_data_header[nsx_nb][data_bl]["nb_data_points"], int(self.__nsx_data_header[nsx_nb][data_bl]["nb_data_points"]),
self.__nsx_basic_header[nsx_nb]["channel_count"], int(self.__nsx_basic_header[nsx_nb]["channel_count"]),
) )
offset = self.__nsx_data_header[nsx_nb][data_bl]["offset_to_data_block"] offset = int(self.__nsx_data_header[nsx_nb][data_bl]["offset_to_data_block"])
# read data # read data
data[data_bl] = np.memmap(filename, dtype="int16", shape=shape, offset=offset, mode="r") data[data_bl] = np.memmap(filename, dtype="int16", shape=shape, offset=offset, mode="r")
...@@ -1828,7 +1828,7 @@ class BlackrockRawIO(BaseRawIO): ...@@ -1828,7 +1828,7 @@ class BlackrockRawIO(BaseRawIO):
""" """
filebuf = open(filename, "rb") filebuf = open(filename, "rb")
filebuf.seek(0, os.SEEK_END) filebuf.seek(0, os.SEEK_END)
file_size = filebuf.tell() file_size = int(filebuf.tell())
filebuf.close() filebuf.close()
return file_size return file_size
...@@ -2007,8 +2007,8 @@ class BlackrockRawIO(BaseRawIO): ...@@ -2007,8 +2007,8 @@ class BlackrockRawIO(BaseRawIO):
nsx_parameters = { nsx_parameters = {
"nb_data_points": int( "nb_data_points": int(
(self.__get_file_size(filename) - bytes_in_headers) (int(self.__get_file_size(filename)) - int(bytes_in_headers))
/ (2 * self.__nsx_basic_header[nsx_nb]["channel_count"]) / int(2 * self.__nsx_basic_header[nsx_nb]["channel_count"])
- 1 - 1
), ),
"labels": labels, "labels": labels,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment