From 315ac9972bbe611b2329b5f38562d937e707c999 Mon Sep 17 00:00:00 2001 From: Julien Barrier <1346858+julienbarrier@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:04:23 +0200 Subject: [PATCH 1/7] posisbility to have a mircat with different chips accessing different wavelengths --- .../drivers/DaylightSolutions/MIRcat.py | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index 06f665a34..7a5ffdc0d 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -91,8 +91,14 @@ class DRSDaylightSolutions_MIRcat(Instrument): def __init__(self, name: str, dll_path: Optional[str] = None, + wavelengths: Optional[Sequence[tuple]] = [(3.0, 8.2),(8.2, 10.3), (10.3, 12.7), (12.7,13.3)], **kwargs: Any) -> None: super().__init__(name, **kwargs) + + _wavelength_chip1 = wavelengths[0] + _wavelength_chip2 = wavelengths[1] + _wavelength_chip3 = wavelengths[2] + _wavelength_chip4 = wavelengths[3] if sys.platform != 'win32': self._dll: Any = None @@ -126,7 +132,7 @@ def __init__(self, label='QCL wavelength', get_cmd=self._get_wavelength, set_cmd=self._set_wavelength, - vals=vals.Numbers(3e-6, 13e-6), + vals=vals.Numbers(_wavelength_chip1[0], _wavelength_chip4[1]), unit='m', instrument=self ) @@ -136,7 +142,7 @@ def __init__(self, label='QCL wavenumber', get_cmd=self._get_wavenumber, set_cmd=self._set_wavenumber, - vals=vals.Numbers(0, 1600), + vals=vals.Numbers(1/_wavelength_chip4[1]/100, 1/_wavelength_chip1[0]/100), unit='cm' + u'\u207b\u00b9', instrument=self ) @@ -753,14 +759,16 @@ def _set_pulse_current(self, pulse_current: float, chip: int = 0) -> None: def _set_wavelength(self, wavelength: float, chip: int = 0) -> None: wavelength = wavelength*1e6 if chip == 0: - if wavelength <= 8.2: + if wavelength <= self._wavelength_chip1[1]: chip = 1 - elif 8.2 < wavelength <= 10.3: + elif self._wavelength_chip2[0] < wavelength <= self._wavelength_chip2[1]: chip = 2 - elif 10.3 < wavelength <= 12.7: + elif self._wavelength_chip3[0] < wavelength <= self._wavelength_chip3[1]: chip = 3 - else: + elif self._wavelength_chip4[0] < wavelength: chip = 4 + else: + raise ValueError('selected wavelength is not supported') self.log.info(f'Set wavelength to {wavelength} on QCL chip {chip}.') self._execute('MIRcatSDK_TuneToWW', @@ -768,17 +776,19 @@ def _set_wavelength(self, wavelength: float, chip: int = 0) -> None: ctypes.c_ubyte(1), ctypes.c_uint8(chip)]) self._get_wavenumber() - + def _set_wavenumber(self, wavenumber: float, chip: int = 0) -> None: if chip == 0: - if wavenumber >= 1219: - chip = 1 - elif 971 <= wavenumber < 1219: - chip = 2 - elif 788 <= wavenumber < 971: + if wavenumber >= 1/self._wavelength_chip4[1]/100: + chip = 4 + elif 1/self._wavelength_chip3[0]/100 > wavenumber >= 1/self._wavelength_chip3[1]/100: chip = 3 + elif 1/self._wavelength_chip2[0]/100 > wavenumber >= 1/self._wavelength_chip2[1]/100: + chip = 2 + elif 1/self._wavelength_chip1[0]/100 > wavenumber: + chip = 1 else: - chip = 4 + raise ValueError('selected wavenumber is not supported') self.log.info(f'Set wavenumber to {wavenumber} on QCL chip {chip}.') self._execute('MIRcatSDK_TuneToWW', From 1971c759aff86aa84039ac0c0c6a35a046577679 Mon Sep 17 00:00:00 2001 From: Julien Barrier <1346858+julienbarrier@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:08:07 +0200 Subject: [PATCH 2/7] doc --- qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index 7a5ffdc0d..b5945215b 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -30,9 +30,9 @@ class DRSDaylightSolutions_MIRcat(Instrument): status: beta-version Args: - name (str): name for the instrument - dll_path (Optional[str], optional): path to the MIRcatSDK driver dll - library file. Defaults to None. + name: name for the instrument + dll_path: path to the MIRcatSDK driver dll library file. Defaults to None. + wavelength: sequence of 2-tuple for the wavelength boundaries of all chips. """ dll_path = 'C:\\MIRcat_laser\\libs\\x64\\MIRcatSDK.dll' From fcfd71f5a6ed4a5dcf6cab201f2d4d42383d3115 Mon Sep 17 00:00:00 2001 From: Julien Barrier <1346858+julienbarrier@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:44:30 +0200 Subject: [PATCH 3/7] automatic selection of the ranges for each QCL chip --- .../drivers/DaylightSolutions/MIRcat.py | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index b5945215b..52f9a2961 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -91,14 +91,14 @@ class DRSDaylightSolutions_MIRcat(Instrument): def __init__(self, name: str, dll_path: Optional[str] = None, - wavelengths: Optional[Sequence[tuple]] = [(3.0, 8.2),(8.2, 10.3), (10.3, 12.7), (12.7,13.3)], **kwargs: Any) -> None: super().__init__(name, **kwargs) - _wavelength_chip1 = wavelengths[0] - _wavelength_chip2 = wavelengths[1] - _wavelength_chip3 = wavelengths[2] - _wavelength_chip4 = wavelengths[3] + + self._limits_chip1 = self.get_limits(1) + self._limits_chip2 = self.get_limits(2) + self._limits_chip3 = self.get_limits(3) + self._limits_chip4 = self.get_limits(4) if sys.platform != 'win32': self._dll: Any = None @@ -132,7 +132,7 @@ def __init__(self, label='QCL wavelength', get_cmd=self._get_wavelength, set_cmd=self._set_wavelength, - vals=vals.Numbers(_wavelength_chip1[0], _wavelength_chip4[1]), + vals=vals.Numbers(self._limits_chip1[0], self._limits_chip4[1]), unit='m', instrument=self ) @@ -142,7 +142,7 @@ def __init__(self, label='QCL wavenumber', get_cmd=self._get_wavenumber, set_cmd=self._set_wavenumber, - vals=vals.Numbers(1/_wavelength_chip4[1]/100, 1/_wavelength_chip1[0]/100), + vals=vals.Numbers(1/self._limits_chip4[1]/100, 1/self._limits_chip1[0]/100), unit='cm' + u'\u207b\u00b9', instrument=self ) @@ -759,13 +759,13 @@ def _set_pulse_current(self, pulse_current: float, chip: int = 0) -> None: def _set_wavelength(self, wavelength: float, chip: int = 0) -> None: wavelength = wavelength*1e6 if chip == 0: - if wavelength <= self._wavelength_chip1[1]: + if wavelength <= self._limits_chip1[1] * 1e6: chip = 1 - elif self._wavelength_chip2[0] < wavelength <= self._wavelength_chip2[1]: + elif self._limits_chip2[0] * 1e6 < wavelength <= self._limits_chip2[1] * 1e6: chip = 2 - elif self._wavelength_chip3[0] < wavelength <= self._wavelength_chip3[1]: + elif self._limits_chip3[0] * 1e6 < wavelength <= self._limits_chip3[1] * 1e6: chip = 3 - elif self._wavelength_chip4[0] < wavelength: + elif self._limits_chip4[0] * 1e6 < wavelength: chip = 4 else: raise ValueError('selected wavelength is not supported') @@ -779,13 +779,13 @@ def _set_wavelength(self, wavelength: float, chip: int = 0) -> None: def _set_wavenumber(self, wavenumber: float, chip: int = 0) -> None: if chip == 0: - if wavenumber >= 1/self._wavelength_chip4[1]/100: + if wavenumber >= 1/self._limits_chip4[1]/100: chip = 4 - elif 1/self._wavelength_chip3[0]/100 > wavenumber >= 1/self._wavelength_chip3[1]/100: + elif 1/self._limits_chip3[0]/100 > wavenumber >= 1/self._limits_chip3[1]/100: chip = 3 - elif 1/self._wavelength_chip2[0]/100 > wavenumber >= 1/self._wavelength_chip2[1]/100: + elif 1/self._limits_chip2[0]/100 > wavenumber >= 1/self._limits_chip2[1]/100: chip = 2 - elif 1/self._wavelength_chip1[0]/100 > wavenumber: + elif 1/self._limits_chip1[0]/100 > wavenumber: chip = 1 else: raise ValueError('selected wavenumber is not supported') From 950f8d7822d17f9f9e00d5fa4ca33bb9888b3720 Mon Sep 17 00:00:00 2001 From: Julien Barrier <1346858+julienbarrier@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:47:21 +0200 Subject: [PATCH 4/7] limits wavelengths --- qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index 52f9a2961..546db2417 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -132,7 +132,7 @@ def __init__(self, label='QCL wavelength', get_cmd=self._get_wavelength, set_cmd=self._set_wavelength, - vals=vals.Numbers(self._limits_chip1[0], self._limits_chip4[1]), + vals=vals.Numbers(self._limits_chip1[0] * 1e-6, self._limits_chip4[1] * 1e-6), unit='m', instrument=self ) From beb1b209baef64f0c352d26394d369cdbfcd3a07 Mon Sep 17 00:00:00 2001 From: Julien Barrier <1346858+julienbarrier@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:08:31 +0200 Subject: [PATCH 5/7] fix bug with difference range/limits --- .../drivers/DaylightSolutions/MIRcat.py | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index 546db2417..bb9579041 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -94,11 +94,6 @@ def __init__(self, **kwargs: Any) -> None: super().__init__(name, **kwargs) - - self._limits_chip1 = self.get_limits(1) - self._limits_chip2 = self.get_limits(2) - self._limits_chip3 = self.get_limits(3) - self._limits_chip4 = self.get_limits(4) if sys.platform != 'win32': self._dll: Any = None @@ -117,6 +112,14 @@ def __init__(self, self._is_keyswitch_set = ctypes.c_bool(False) self._execute('MIRcatSDK_IsKeySwitchStatusSet', [ctypes.byref(self._is_keyswitch_set)]) + self._limits_chip1 = self.get_limits(1) + self._limits_chip2 = self.get_limits(2) + self._limits_chip3 = self.get_limits(3) + self._limits_chip4 = self.get_limits(4) + self._range_chip1 = self.get_ranges(1) + self._range_chip2 = self.get_ranges(2) + self._range_chip3 = self.get_ranges(3) + self._range_chip4 = self.get_ranges(4) self.status = Parameter( 'status', @@ -132,7 +135,7 @@ def __init__(self, label='QCL wavelength', get_cmd=self._get_wavelength, set_cmd=self._set_wavelength, - vals=vals.Numbers(self._limits_chip1[0] * 1e-6, self._limits_chip4[1] * 1e-6), + vals=vals.Numbers(self._range_chip1[0], self._range_chip4[1]), unit='m', instrument=self ) @@ -142,7 +145,7 @@ def __init__(self, label='QCL wavenumber', get_cmd=self._get_wavenumber, set_cmd=self._set_wavenumber, - vals=vals.Numbers(1/self._limits_chip4[1]/100, 1/self._limits_chip1[0]/100), + vals=vals.Numbers(1/self._range_chip4[1]/100, 1/self._range_chip1[0]/100), unit='cm' + u'\u207b\u00b9', instrument=self ) @@ -197,7 +200,7 @@ def __init__(self, label='Pulse rate for chip 1', get_cmd=partial(self._get_pulse_rate, chip=1), set_cmd=partial(self._set_pulse_rate, chip=1), - vals=vals.Numbers(100, 1e6), + vals=vals.Numbers(max_value=self._limits_chip1[0]), unit='Hz', instrument=self ) @@ -207,7 +210,7 @@ def __init__(self, label='Pulse rate for chip 2', get_cmd=partial(self._get_pulse_rate, chip=2), set_cmd=partial(self._set_pulse_rate, chip=2), - vals=vals.Numbers(100, 1e6), + vals=vals.Numbers(max_value=self._limits_chip2[0]), unit='Hz', instrument=self ) @@ -217,7 +220,7 @@ def __init__(self, label='Pulse rate for chip 3', get_cmd=partial(self._get_pulse_rate, chip=3), set_cmd=partial(self._set_pulse_rate, chip=3), - vals=vals.Numbers(100, 1e6), + vals=vals.Numbers(max_value=self._limits_chip3[0]), unit='Hz', instrument=self ) @@ -227,7 +230,7 @@ def __init__(self, label='Pulse rate for chip 4', get_cmd=partial(self._get_pulse_rate, chip=4), set_cmd=partial(self._set_pulse_rate, chip=4), - vals=vals.Numbers(100, 1e6), + vals=vals.Numbers(max_value=self._limits_chip4[0]), unit='Hz', instrument=self ) @@ -237,7 +240,7 @@ def __init__(self, label='Pulse width for chip 1', get_cmd=partial(self._get_pulse_width, chip=1), set_cmd=partial(self._set_pulse_width, chip=1), - vals=vals.Numbers(40e-9, 500e-9), + vals=vals.Numbers(max_value=self._limits_chip1[1]), unit='s', instrument=self ) @@ -247,7 +250,7 @@ def __init__(self, label='Pulse width for chip 2', get_cmd=partial(self._get_pulse_width, chip=2), set_cmd=partial(self._set_pulse_width, chip=2), - vals=vals.Numbers(40e-9, 500e-9), + vals=vals.Numbers(max_value=self._limits_chip2[1]), unit='s', instrument=self ) @@ -257,7 +260,7 @@ def __init__(self, label='Pulse width for chip 3', get_cmd=partial(self._get_pulse_width, chip=3), set_cmd=partial(self._set_pulse_width, chip=3), - vals=vals.Numbers(40e-9, 500e-9), + vals=vals.Numbers(max_value=self._limits_chip3[1]), unit='s', instrument=self ) @@ -267,7 +270,7 @@ def __init__(self, label='Pulse width for chip 4', get_cmd=partial(self._get_pulse_width, chip=4), set_cmd=partial(self._set_pulse_width, chip=4), - vals=vals.Numbers(40e-9, 500e-9), + vals=vals.Numbers(max_value=self._limits_chip4[1]), unit='s', instrument=self ) @@ -277,7 +280,7 @@ def __init__(self, label='Pulse current for chip 1', get_cmd=partial(self._get_pulse_current, chip=1), set_cmd=partial(self._set_pulse_current, chip=1), - vals=vals.Numbers(), + vals=vals.Numbers(max_value=self._limits_chip1[3]), unit='A', instrument=self ) @@ -287,7 +290,7 @@ def __init__(self, label='Pulse current for chip 2', get_cmd=partial(self._get_pulse_current, chip=2), set_cmd=partial(self._set_pulse_current, chip=2), - vals=vals.Numbers(), + vals=vals.Numbers(max_value=self._limits_chip2[3]), unit='A', instrument=self ) @@ -296,7 +299,7 @@ def __init__(self, label='Pulse current for chip 3', get_cmd=partial(self._get_pulse_current, chip=3), set_cmd=partial(self._set_pulse_current, chip=3), - vals=vals.Numbers(), + vals=vals.Numbers(max_value=self._limits_chip3[3]), unit='A', instrument=self ) @@ -305,7 +308,7 @@ def __init__(self, label='Pulse current for chip 4', get_cmd=partial(self._get_pulse_current, chip=4), set_cmd=partial(self._set_pulse_current, chip=4), - vals=vals.Numbers(), + vals=vals.Numbers(max_value=self._limits_chip4[3]), unit='A', instrument=self ) @@ -462,7 +465,7 @@ def get_ranges(self, chip: int = 0) -> tuple: [chip, ctypes.byref(pf_min_range), ctypes.byref(pf_max_range), ctypes.byref(pb_units)]) - return (pf_min_range.value*1e6, pf_max_range.value*1e6) + return (pf_min_range.value*1e-6, pf_max_range.value*1e-6) def check_tune(self) -> float: """Check the QCL tune. @@ -759,13 +762,13 @@ def _set_pulse_current(self, pulse_current: float, chip: int = 0) -> None: def _set_wavelength(self, wavelength: float, chip: int = 0) -> None: wavelength = wavelength*1e6 if chip == 0: - if wavelength <= self._limits_chip1[1] * 1e6: + if wavelength <= self._range_chip1[1]: chip = 1 - elif self._limits_chip2[0] * 1e6 < wavelength <= self._limits_chip2[1] * 1e6: + elif self._range_chip2[0] < wavelength <= self._range_chip2[1]: chip = 2 - elif self._limits_chip3[0] * 1e6 < wavelength <= self._limits_chip3[1] * 1e6: + elif self._range_chip3[0] < wavelength <= self._range_chip3[1]: chip = 3 - elif self._limits_chip4[0] * 1e6 < wavelength: + elif self._range_chip4[0] < wavelength: chip = 4 else: raise ValueError('selected wavelength is not supported') @@ -779,13 +782,13 @@ def _set_wavelength(self, wavelength: float, chip: int = 0) -> None: def _set_wavenumber(self, wavenumber: float, chip: int = 0) -> None: if chip == 0: - if wavenumber >= 1/self._limits_chip4[1]/100: + if wavenumber >= 1/self._range_chip4[1]/100: chip = 4 - elif 1/self._limits_chip3[0]/100 > wavenumber >= 1/self._limits_chip3[1]/100: + elif 1/self._range_chip3[0]/100 > wavenumber >= 1/self._range_chip3[1]/100: chip = 3 - elif 1/self._limits_chip2[0]/100 > wavenumber >= 1/self._limits_chip2[1]/100: + elif 1/self._range_chip2[0]/100 > wavenumber >= 1/self._range_chip2[1]/100: chip = 2 - elif 1/self._limits_chip1[0]/100 > wavenumber: + elif 1/self._range_chip1[0]/100 > wavenumber: chip = 1 else: raise ValueError('selected wavenumber is not supported') From 9b83aee600cc7d352379cd0ba3baa2a03cd488a3 Mon Sep 17 00:00:00 2001 From: Julien Barrier <1346858+julienbarrier@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:50:29 +0200 Subject: [PATCH 6/7] fix mypy --- .../drivers/DaylightSolutions/MIRcat.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index bb9579041..f53068a87 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -13,7 +13,7 @@ import time import sys import ctypes -from typing import Optional, Any, Sequence +from typing import Optional, Any, Sequence, Tuple from functools import partial from qcodes import Instrument, Parameter @@ -116,10 +116,10 @@ def __init__(self, self._limits_chip2 = self.get_limits(2) self._limits_chip3 = self.get_limits(3) self._limits_chip4 = self.get_limits(4) - self._range_chip1 = self.get_ranges(1) - self._range_chip2 = self.get_ranges(2) - self._range_chip3 = self.get_ranges(3) - self._range_chip4 = self.get_ranges(4) + self._range_chip1: tuple[float, float] = self.get_ranges(1) + self._range_chip2: tuple[float, float] = self.get_ranges(2) + self._range_chip3: tuple[float, float] = self.get_ranges(3) + self._range_chip4: tuple[float, float] = self.get_ranges(4) self.status = Parameter( 'status', @@ -146,7 +146,7 @@ def __init__(self, get_cmd=self._get_wavenumber, set_cmd=self._set_wavenumber, vals=vals.Numbers(1/self._range_chip4[1]/100, 1/self._range_chip1[0]/100), - unit='cm' + u'\u207b\u00b9', + unit='cm' + '\u207b\u00b9', instrument=self ) @@ -164,7 +164,7 @@ def __init__(self, label='Temperature of chip 1', get_cmd=partial(self._get_temperature, chip=1), vals=vals.Numbers(), - unit=u'\u00b0'+'C', + unit='\u00b0'+'C', instrument=self ) @@ -173,7 +173,7 @@ def __init__(self, label='Temperature of chip 2', get_cmd=partial(self._get_temperature, chip=2), vals=vals.Numbers(), - unit=u'\u00b0'+'C', + unit='\u00b0'+'C', instrument=self ) @@ -182,7 +182,7 @@ def __init__(self, label='Temperature of chip 3', get_cmd=partial(self._get_temperature, chip=3), vals=vals.Numbers(), - unit=u'\u00b0'+'C', + unit='\u00b0'+'C', instrument=self ) @@ -191,7 +191,7 @@ def __init__(self, label='Temperature of chip 4', get_cmd=partial(self._get_temperature, chip=4), vals=vals.Numbers(), - unit=u'\u00b0'+'C', + unit='\u00b0'+'C', instrument=self ) @@ -353,7 +353,7 @@ def set_pulse_parameters(self, ctypes.c_float(pulse_width*1e9), ctypes.c_float(current*1e3)]) - def get_limits(self, chip: int = 0) -> tuple: + def get_limits(self, chip: int = 0) -> Tuple[float, ...]: """Get the limits for a given QCL chip. Args: @@ -438,7 +438,7 @@ def disarm(self) -> None: self._execute('MIRcatSDK_IsLaserArmed', [ctypes.byref(is_armed)]) time.sleep(1) - def get_ranges(self, chip: int = 0) -> tuple: + def get_ranges(self, chip: int = 0) -> tuple[float, float]: """Get the acceptable range for a given QCL chip. Args: From 0841782377c0011fff863c5fe6875058db0738cf Mon Sep 17 00:00:00 2001 From: Mikhail Astafev Date: Mon, 23 Oct 2023 09:34:27 +0200 Subject: [PATCH 7/7] Apply suggestions from code review --- qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py index f53068a87..9402085a0 100644 --- a/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py +++ b/qcodes_contrib_drivers/drivers/DaylightSolutions/MIRcat.py @@ -13,7 +13,7 @@ import time import sys import ctypes -from typing import Optional, Any, Sequence, Tuple +from typing import Optional, Any, Sequence from functools import partial from qcodes import Instrument, Parameter @@ -353,7 +353,7 @@ def set_pulse_parameters(self, ctypes.c_float(pulse_width*1e9), ctypes.c_float(current*1e3)]) - def get_limits(self, chip: int = 0) -> Tuple[float, ...]: + def get_limits(self, chip: int = 0) -> tuple[float, ...]: """Get the limits for a given QCL chip. Args: @@ -791,7 +791,7 @@ def _set_wavenumber(self, wavenumber: float, chip: int = 0) -> None: elif 1/self._range_chip1[0]/100 > wavenumber: chip = 1 else: - raise ValueError('selected wavenumber is not supported') + raise ValueError(f'selected wavenumber {wavenumber} is not supported') self.log.info(f'Set wavenumber to {wavenumber} on QCL chip {chip}.') self._execute('MIRcatSDK_TuneToWW',