Skip to content

Commit c79da16

Browse files
authored
Merge pull request #8097 from SherwanMicrosoft/fix/dynacool-driver-init-and-temperature-setpoint
Fix DynaCool driver init and temperature_setpoint cache update
2 parents 955704d + bcfc09a commit c79da16

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Fixed three bugs in :class:`qcodes.instrument_drivers.QuantumDesign.DynaCoolPPMS.DynaCool.DynaCool`
2+
that prevented the driver from instantiating and from updating the
3+
``temperature_setpoint`` cache:
4+
5+
- ``block_while_ramping_temperature`` is now created with ``set_cmd=None`` /
6+
``get_cmd=None`` so it behaves as a settable cache-only parameter, instead of
7+
``set_cmd=False`` / ``get_cmd=False`` which made it read-only and rejected
8+
the supplied ``initial_value``.
9+
- Removed the duplicate ``instrument=self`` argument from the
10+
``blocking_t_state_check_interval`` parameter creation, which is supplied
11+
automatically by ``add_parameter`` and was raising on construction.
12+
- Fixed an ``AttributeError`` when setting the temperature: the cache update
13+
in ``_set_temperature_and_state`` now correctly references
14+
``self.temperature_setpoint`` rather than the non-existent ``self.setpoint``.

src/qcodes/instrument_drivers/QuantumDesign/DynaCoolPPMS/DynaCool.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,14 @@ def __init__(
8383
label="Block instrument while ramping temperature",
8484
initial_value=False,
8585
vals=vals.Bool(),
86-
get_cmd=False,
87-
set_cmd=False,
86+
get_cmd=None,
87+
set_cmd=None,
8888
)
8989
"""Parameter block_while_ramping_temperature, when set to True,
9090
will block further interaction while temperature is ramping to setpoint."""
9191

9292
self.blocking_t_state_check_interval: Parameter = self.add_parameter(
9393
name="blocking_t_state_check_interval",
94-
instrument=self,
9594
initial_value=0.5,
9695
unit="s",
9796
vals=vals.Numbers(0, 60),
@@ -433,7 +432,7 @@ def _temp_setter(
433432
while self.temperature_state() != "stable":
434433
sleep(self.blocking_t_state_check_interval())
435434

436-
self.setpoint.cache._set_from_raw_value(values[0])
435+
self.temperature_setpoint.cache._set_from_raw_value(values[0])
437436

438437
def write(self, cmd: str) -> None:
439438
"""

0 commit comments

Comments
 (0)