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: 2 additions & 0 deletions docs/changes/newsfragments/7607.improved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes a bug in the LinSweeper iterator that caused it to always raise StopIteration after
completing a single sweep. This bug meant LinSweeper could not be used in a nested measurement function.
1 change: 1 addition & 0 deletions src/qcodes/dataset/measurement_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,5 @@ def __next__(self) -> float:
self._iter_index += 1
return set_val
else:
self._iter_index = 0
raise StopIteration
25 changes: 25 additions & 0 deletions tests/dataset/test_measurement_extensions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import gc
import itertools
from functools import partial
from itertools import product
from pathlib import Path
Expand Down Expand Up @@ -238,6 +239,30 @@ def test_linsweeper(default_params, default_database_and_experiment):
)


def test_nested_linsweeper(default_params):
set1, set2, _, _, _, _ = default_params
linsweeper1 = LinSweeper(set1, 0, 1, 11, 0.001)
linsweeper2 = LinSweeper(set2, -1, 0, 6, 0.001)
data_pairs = []
for _ in linsweeper1:
for _ in linsweeper2:
data_pairs.append([set1(), set2()])

assert len(data_pairs) == 11 * 6
assert np.all(
np.isclose(
np.array(data_pairs),
np.array(
list(
itertools.product(
linsweeper1.get_setpoints(), linsweeper2.get_setpoints()
)
)
),
)
)


def test_context_with_pws(pws_params, default_database_and_experiment):
_ = default_database_and_experiment
pws1, set1 = pws_params
Expand Down
Loading