Skip to content

Update read.py #18

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

Open
TahaAbbasi-Hashemi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update read.py #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions adi/read.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,10 +1124,25 @@ def get_n_records(h):
def get_n_channels(h):
n_channels = ffi.new("long *")
result = lib.ADI_GetNumberOfChannels(h[0],n_channels)
if result == 0:
return n_channels[0]
else:
if result != 0:
raise Exception('Error getting # of channels')

# ADI_GetNumberOfChannels can under-report the true channel count
# for some files. Probe subsequent channel ids via ADI_GetChannelName
# (which is authoritative) to pick up any channels it missed.
count = n_channels[0]
probe_id = count + 1
while True:
text = ffi.new("wchar_t[1000]")
text_length = ffi.new("long *")
probe_result = lib.ADI_GetChannelName(h[0],probe_id-1,text,999,text_length)
if probe_result == 0 or probe_result == 1:
count = probe_id
probe_id += 1
else:
break

return count

@staticmethod
def close_file(h):
Expand Down