diff --git a/docs/changes/newsfragments/5021.improved_driver b/docs/changes/newsfragments/5021.improved_driver new file mode 100644 index 00000000000..2a43e5c6cce --- /dev/null +++ b/docs/changes/newsfragments/5021.improved_driver @@ -0,0 +1,2 @@ +Added support for AimTTi QL355TP power supply. +Moved _numOutputChannels lookup table to the class body. diff --git a/qcodes/instrument_drivers/AimTTi/Aim_TTi_QL355_TP.py b/qcodes/instrument_drivers/AimTTi/Aim_TTi_QL355_TP.py new file mode 100644 index 00000000000..e60573eec11 --- /dev/null +++ b/qcodes/instrument_drivers/AimTTi/Aim_TTi_QL355_TP.py @@ -0,0 +1,9 @@ +from ._AimTTi_PL_P import AimTTi + + +class AimTTiQL355TP(AimTTi): + """ + This is the QCoDeS driver for the Aim TTi QL355TP series power supply. + """ + + pass diff --git a/qcodes/instrument_drivers/AimTTi/_AimTTi_PL_P.py b/qcodes/instrument_drivers/AimTTi/_AimTTi_PL_P.py index f823caa6472..55a4637544a 100644 --- a/qcodes/instrument_drivers/AimTTi/_AimTTi_PL_P.py +++ b/qcodes/instrument_drivers/AimTTi/_AimTTi_PL_P.py @@ -214,6 +214,16 @@ class AimTTi(VisaInstrument): Tested with Aim TTi PL601-P equipped with a single output channel. """ + _numOutputChannels = { + "PL068-P": 1, + "PL155-P": 1, + "PL303-P": 1, + "PL601-P": 1, + "PL303QMD-P": 2, + "PL303QMT-P": 3, + "QL355TP": 3, + } + def __init__(self, name: str, address: str, **kwargs: Any) -> None: """ Args: @@ -226,19 +236,10 @@ def __init__(self, name: str, address: str, **kwargs: Any) -> None: _model = self.get_idn()["model"] - _numOutputChannels = { - "PL068-P": 1, - "PL155-P": 1, - "PL303-P": 1, - "PL601-P": 1, - "PL303QMD-P": 2, - "PL303QMT-P": 3, - } - - if (_model not in _numOutputChannels.keys()) or (_model is None): + if (_model not in self._numOutputChannels.keys()) or (_model is None): raise NotKnownModel("Unknown model, connection cannot be " "established.") - self.numOfChannels = _numOutputChannels[_model] + self.numOfChannels = self._numOutputChannels[_model] for i in range(1, self.numOfChannels + 1): channel = AimTTiChannel(self, f"ch{i}", i) channels.append(channel) diff --git a/qcodes/instrument_drivers/AimTTi/__init__.py b/qcodes/instrument_drivers/AimTTi/__init__.py index 0e0932d9d0a..ffc6aa1bd86 100644 --- a/qcodes/instrument_drivers/AimTTi/__init__.py +++ b/qcodes/instrument_drivers/AimTTi/__init__.py @@ -5,6 +5,7 @@ from .Aim_TTi_PL303QMD_P import AimTTiPL303QMDP from .Aim_TTi_PL303QMT_P import AimTTiPL303QMTP from .Aim_TTi_PL601_P import AimTTiPL601 +from .Aim_TTi_QL355_TP import AimTTiQL355TP __all__ = [ "AimTTiChannel", @@ -14,5 +15,6 @@ "AimTTiPL303QMDP", "AimTTiPL303QMTP", "AimTTiPL601", + "AimTTiQL355TP", "NotKnownModel", ]