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 qcodes/instrument/parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ def get_ramp_values(self, value: Union[float, int],
raise RuntimeError("Don't know how to step a parameter with more than one value")
if self.get_latest() is None:
self.get()
start_value = self.raw_value
start_value = self.get_latest()

if not (isinstance(start_value, (int, float)) and
isinstance(value, (int, float))):
Expand Down
57 changes: 56 additions & 1 deletion qcodes/tests/test_parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
from time import sleep

import numpy as np

from hypothesis import given
import hypothesis.strategies as hst
from qcodes import Function
from qcodes.instrument.parameter import (
Parameter, ArrayParameter, MultiParameter,
Expand Down Expand Up @@ -680,6 +681,60 @@ def test_val_mapping_with_parsers(self):
self._p = 'PVAL: 1'
self.assertEqual(p(), 'on')

@given(scale=hst.integers(1, 100),
value=hst.floats(min_value=1e-9, max_value=10))
def test_ramp_scaled(self, scale, value):
p = Parameter('p', set_cmd=self.set_p, get_cmd=self.get_p, scale=scale,
initial_value=0)
assert p() == 0.0
# first set a step size
p.step = 0.1
# and a wait time
p.inter_delay = 1e-9 # in seconds
expected_output =np.linspace(0.1,10,100)
np.testing.assert_allclose(p.get_ramp_values(10, p.step),
expected_output)
p.set(value)
np.testing.assert_allclose(p.get(), value)
assert p.raw_value == value * scale

@given(value=hst.floats(min_value=1e-9, max_value=10))
def test_ramp_parser(self, value):
p = Parameter('p', set_cmd=self.set_p, get_cmd=self.get_p,
set_parser=lambda x: -x,
get_parser=lambda x: -x,
initial_value=0)
assert p() == 0.0
# first set a step size
p.step = 0.1
# and a wait time
p.inter_delay = 1e-9 # in seconds
expected_output =np.linspace(0.1,10,100)
np.testing.assert_allclose(p.get_ramp_values(10, p.step),
expected_output)
p.set(value)
assert p.get() == value
assert p.raw_value == -value

@given(scale=hst.integers(1, 100),
value=hst.floats(min_value=1e-9, max_value=10))
def test_ramp_parsed_scaled(self, scale, value):
p = Parameter('p', set_cmd=self.set_p, get_cmd=self.get_p, scale=scale,
set_parser=lambda x: -x,
get_parser=lambda x: -x,
initial_value=0)
assert p() == 0.0
# first set a step size
p.step = 0.1
# and a wait time
p.inter_delay = 1e-9 # in seconds
expected_output =np.linspace(0.1,10,100)
np.testing.assert_allclose(p.get_ramp_values(10, p.step),
expected_output)
p.set(value)
np.testing.assert_allclose(p.get(), value)
assert p.raw_value == -scale * value

class TestManualParameterValMapping(TestCase):
def setUp(self):
self.instrument = DummyInstrument('dummy_holder')
Expand Down