Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion qupulse/hardware/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def check_invalid_values(ch_data):
if ch2 is None:
ch2 = np.zeros(size)
else:
check_invalid_values(ch1)
check_invalid_values(ch2)
marker_data = np.zeros(size, dtype=np.uint16)
for idx, marker in enumerate(markers):
if marker is not None:
Expand Down
2 changes: 2 additions & 0 deletions tests/hardware/util_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ def test_size_exception(self):
def test_range_exception(self):
with self.assertRaisesRegex(ValueError, "invalid"):
zhinst_voltage_to_uint16(2.*np.ones(192), None, (None, None, None, None))
with self.assertRaisesRegex(ValueError, "invalid"):
zhinst_voltage_to_uint16(None, 2.*np.ones(192), (None, None, None, None))
# this should work
zhinst_voltage_to_uint16(None, None, (2. * np.ones(192), None, None, None))

Expand Down
Loading