Skip to content

Numpy compatibility updates to raw.py #2

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
sdmurthy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Numpy compatibility updates to raw.py #2

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions leep/raw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ def wait_for_acq(self, tag=False, toggle_tag=False, timeout=5.0,

if self.rfs:
T, = self.reg_read(['dsp_tag'], instance=instance)
T = int(T)
if tag or toggle_tag:
T = (T + 1) & 0xff
self.reg_write([('dsp_tag', T)], instance=instance)
Expand Down Expand Up @@ -350,8 +351,8 @@ def wait_for_acq(self, tag=False, toggle_tag=False, timeout=5.0,

if self.rfs:
slow, = self.reg_read(['slow_data'], instance=instance)
tag_old = slow[34]
tag_new = slow[33]
tag_old = int(slow[34])
tag_new = int(slow[33])
dT = (tag_old - T) & 0xff
tag_match = dT == 0 and tag_new == tag_old

Expand Down
4 changes: 2 additions & 2 deletions leep/test/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,12 @@ def test_parseTransaction():
for _input in bads:
try:
result = parseTransaction(_input)
print(f"Expected an exception for input: { _input } but got {result}")
print(f"Expected an exception for input: {_input} but got {result}")
errors += 1
except ValueError:
pass
except Exception as ex:
print(f"Unexpected exception for input: { _input }: { ex }")
print(f"Unexpected exception for input: {_input}: {ex}")
errors += 1
return errors

Expand Down