Skip to content

Blackrock rawio fix overflow #1690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2025
Merged

Blackrock rawio fix overflow #1690

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48579d2
fix overflow
luiztauffer Apr 23, 2025
065c155
int
luiztauffer Apr 23, 2025
9604183
Merge branch 'master' into fix-blackrock-overflow
zm711 Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions neo/rawio/blackrockrawio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,8 +1058,8 @@ def __read_nsx_data_variant_a(self, nsx_nb):
filename = ".".join([self._filenames["nsx"], f"ns{nsx_nb}"])

# get shape of data
shape = (self.__nsx_params["2.1"](nsx_nb)["nb_data_points"], self.__nsx_basic_header[nsx_nb]["channel_count"])
offset = self.__nsx_params["2.1"](nsx_nb)["bytes_in_headers"]
shape = (int(self.__nsx_params["2.1"](nsx_nb)["nb_data_points"]), int(self.__nsx_basic_header[nsx_nb]["channel_count"]))
offset = int(self.__nsx_params["2.1"](nsx_nb)["bytes_in_headers"])

# read nsx data
# store as dict for compatibility with higher file specs
Expand All @@ -1078,10 +1078,10 @@ def __read_nsx_data_variant_b(self, nsx_nb):
for data_bl in self.__nsx_data_header[nsx_nb].keys():
# get shape and offset of data
shape = (
self.__nsx_data_header[nsx_nb][data_bl]["nb_data_points"],
self.__nsx_basic_header[nsx_nb]["channel_count"],
int(self.__nsx_data_header[nsx_nb][data_bl]["nb_data_points"]),
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
data[data_bl] = np.memmap(filename, dtype="int16", shape=shape, offset=offset, mode="r")
Expand Down Expand Up @@ -1828,7 +1828,7 @@ def __get_file_size(self, filename):
"""
filebuf = open(filename, "rb")
filebuf.seek(0, os.SEEK_END)
file_size = filebuf.tell()
file_size = int(filebuf.tell())
filebuf.close()

return file_size
Expand Down Expand Up @@ -2007,8 +2007,8 @@ def __get_nsx_param_variant_a(self, nsx_nb):

nsx_parameters = {
"nb_data_points": int(
(self.__get_file_size(filename) - bytes_in_headers)
/ (2 * self.__nsx_basic_header[nsx_nb]["channel_count"])
(int(self.__get_file_size(filename)) - int(bytes_in_headers))
/ int(2 * self.__nsx_basic_header[nsx_nb]["channel_count"])
- 1
),
"labels": labels,
Expand Down
Loading