Merge branch 'feature/tektronix-dpo' into feature/tektronix-combined

Author: benn-thomsen

requirements.txt

@@ -54,7 +54,7 @@ comm==0.2.3
     #   ipywidgets
 contourpy==1.3.3
     # via matplotlib
-coverage==7.13.3
+coverage==7.13.4
     # via
     #   qcodes (pyproject.toml)
     #   pytest-cov
@@ -102,7 +102,7 @@ h5py==3.15.1
     #   qcodes-loop
 hickle==5.0.3
     # via qcodes-loop
-hypothesis==6.151.5
+hypothesis==6.151.6
     # via qcodes (pyproject.toml)
 idna==3.11
     # via requests
@@ -262,13 +262,13 @@ pandas-stubs==3.0.0.260204
     # via qcodes (pyproject.toml)
 pandocfilters==1.5.1
     # via nbconvert
-parso==0.8.5
+parso==0.8.6
     # via jedi
 partd==1.4.2
     # via dask
 pathspec==1.0.4
     # via mypy
-pillow==12.1.0
+pillow==12.1.1
     # via
     #   qcodes (pyproject.toml)
     #   matplotlib
@@ -453,7 +453,7 @@ traitlets==5.14.3
     #   nbsphinx
 types-jsonschema==4.26.0.20260202
     # via qcodes (pyproject.toml)
-types-networkx==3.6.1.20251220
+types-networkx==3.6.1.20260210
     # via qcodes (pyproject.toml)
 types-pytz==2025.2.0.20251108
     # via pandas-stubs

src/qcodes/instrument_drivers/tektronix/AWG70000A.py

@@ -8,7 +8,7 @@
 import xml.etree.ElementTree as ET
 import zipfile as zf
 from functools import partial
-from typing import TYPE_CHECKING, Any, Self
+from typing import TYPE_CHECKING, Any, Literal, Self
 
 import numpy as np
 import numpy.typing as npt
@@ -191,7 +191,7 @@ def __init__(
         if channel not in list(range(1, num_channels + 1)):
             raise ValueError("Illegal channel value.")
 
-        self.state: Parameter = self.add_parameter(
+        self.state: Parameter[int, Self] = self.add_parameter(
             "state",
             label=f"Channel {channel} state",
             get_cmd=f"OUTPut{channel}:STATe?",
@@ -201,7 +201,7 @@ def __init__(
         )
         """Channel State: (OFF: 0, ON: 1)"""
 
-        self.hold: Parameter = self.add_parameter(
+        self.hold: Parameter[Literal["FIRST", "ZERO"], Self] = self.add_parameter(
             "hold",
             label=f"Channel {channel} hold value",
             get_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE?",

src/qcodes/instrument_drivers/tektronix/DPO7200xx.py

@@ -826,8 +826,7 @@ def __init__(
         sequence, a new single sequence acquisition will be started. If the last acquisition
         was continuous, a new continuous acquisition will be started.
 
-        Args:
-            state: 'ON', 'OFF', 'RUN', or 'STOP'
+        State can be 'ON', 'OFF', 'RUN', or 'STOP'.
 
         """
 
@@ -873,7 +872,7 @@ def __init__(
         super().__init__(parent, name, **kwargs)
         self._identifier = "B" if delayed_trigger else "A"
 
-        trigger_types = ["EDGE", "edge", "logic", "pulse"]
+        trigger_types = ["edge", "logic", "pulse"]
         if self._identifier == "A":
             trigger_types.extend(
                 ["video", "i2c", "can", "spi", "communication", "serial", "rs232"]
@@ -935,7 +934,10 @@ def __init__(
             vals=Enum(*edge_couplings),
             get_parser=str.lower,
         )
-        """Trigger edge coupling: 'ac', 'dc', 'hfrej', 'lfrej', 'noiserej', 'atrigger'"""
+        """Trigger edge coupling for A and B triggers:
+        Trigger A: 'ac', 'dc', 'hfrej', 'lfrej', 'noiserej'
+        Trigger B: 'ac', 'dc', 'hfrej', 'lfrej', 'noiserej', 'atrigger'
+        """
 
         self.edge_slope: Parameter = self.add_parameter(
             "edge_slope",
@@ -1220,19 +1222,10 @@ def reset(self) -> None:
 
 class TektronixDPOMeasurementImmediate(InstrumentChannel):
     """
-    The cursor submodule allows you to set and retrieve
-    information regarding the cursor type, state, and
-    positions. The cursor can be used to measure
-    voltage and time differences between two points on
-    the waveform display.
-
-    Methods:
-        - function: Set or get the cursor type (e.g., horizontal bars, vertical bars, etc.)
-        - state: Set or get the cursor state (ON or OFF)
-        - x1: Set or get the x1 position of the cursor (in seconds)
-        - x2: Set or get the x2 position of the cursor (in seconds)
-        - y1: Set or get the y1 position of the cursor (in Volts)
-        - y2: Set or get the y2 position of the cursor (in Volts)
+    The measurement commands let you specify an additional measurement, IMMed. The immediate measurement
+    has no front panel equivalent. Immediate measurements are never displayed.
+    Because they are computed only when needed, immediate measurements slow the
+    waveform update rate less than displayed measurements.
 
     """
 
@@ -1250,42 +1243,116 @@ def __init__(
             set_cmd="MEASUrement:GATing {}",
             vals=Enum("ON", "OFF", "ZOOM1", "ZOOM2", "ZOOM3", "ZOOM4", "CURSOR"),
         )
+        """Gating for the immediate measurement. Gating allows you to specify a subset of the waveform
+        to be measured. When gating is on, the measurement is performed only on the portion of the waveform
+        defined by the gate. The gate can be defined by zooming in on a portion of
+        the waveform and selecting one of the zoom gates (ZOOM1, ZOOM2, ZOOM3, ZOOM4), or by using the
+        cursor gate (CURSOR), which uses the horizontal positions of the cursors to define the gate.
+        """
+
         self.source1: Parameter = self.add_parameter(
             "source1",
             get_cmd="MEASUrement:IMMed:SOUrce1?",
             set_cmd="MEASUrement:IMMed:SOUrce1 {}",
             vals=Enum(*TektronixDPOWaveform.valid_identifiers),
         )
+        """Source 1 for the immediate measurement:
+        CH1, CH2, CH3, CH4, MATH1, MATH2, MATH3, MATH4,
+        REF1, REF2, REF3, REF4, HISTogram"""
 
         self.source2: Parameter = self.add_parameter(
             "source2",
             get_cmd="MEASUrement:IMMed:SOUrce2?",
             set_cmd="MEASUrement:IMMed:SOUrce2 {}",
             vals=Enum(*TektronixDPOWaveform.valid_identifiers),
         )
+        """Source 2 for the immediate measurement.  Source2 measurements only apply
+        to phase and delay measurement types, which require both a target (Source1)
+        and reference (Source2) source.
+        CH1, CH2, CH3, CH4, MATH1, MATH2, MATH3, MATH4,
+        REF1, REF2, REF3, REF4
+        """
 
         self.type: Parameter = self.add_parameter(
             "type",
             get_cmd="MEASUrement:IMMed:TYPE?",
             set_cmd="MEASUrement:IMMed:TYPE {}",
             vals=Enum(
+                "ACRMS",
+                "AMPlitude",
+                "AREa",
+                "BURst",
+                "CARea",
+                "CMEan",
+                "CRMs",
+                "DELay",
+                "DISTDUty",
+                "EXTINCTDB",
+                "EXTINCTPCT",
+                "EXTINCTRATIO",
+                "EYEHeight",
+                "EYEWIdth",
+                "FALL",
+                "FREQuency",
+                "HIGH",
+                "HITs",
+                "LOW",
+                "MAXimum",
                 "MEAN",
+                "MEDian",
+                "MINImum",
+                "NCROss",
+                "NDUty",
+                "NOVershoot",
+                "NWIdth",
+                "PBASe",
+                "PCROss",
+                "PCTCROss",
+                "PDUty",
+                "PEAKHits",
+                "PERIod",
+                "PHAse",
+                "PK2Pk",
+                "PKPKJitter",
+                "PKPKNoise",
+                "POVershoot",
+                "PTOP",
+                "PWIdth",
+                "QFACtor",
+                "RISe",
+                "RMS",
+                "RMSJitter",
+                "RMSNoise",
+                "SIGMA1",
+                "SIGMA2",
+                "SIGMA3",
+                "SIXSigmajit",
+                "SNRatio",
+                "STDdev",
+                "UNDEFINED",
+                "WAVEFORMS",
             ),
             get_parser=str.lower,
         )
-        """Cursor Type [OFF, HBARS, VBARS, SCREEN, WAVEFORM]"""
+        """
+        Immediate measurement type
+        Please see page 2-547 of the programmers manual for a detailed description of these arguments.
+        https://download.tek.com/manual/MSO-DPO5000-B-DPO7000-C-DPO70000-B-C-D-DX-DSA70000-B-C-D-and-MSO70000-C-DX-_2.pdf
+        """
 
         self.units: Parameter = self.add_parameter(
             "units",
             get_cmd="MEASUrement:IMMed:UNITS?",
             get_parser=strip_quotes,
         )
+        """Units of the immediate measurement"""
 
         self.value: Parameter = self.add_parameter(
             "value",
             get_cmd="MEASUrement:IMMed:VALue?",
             get_parser=float,
         )
+        """The value of the immediate measurement"""
 
 
 class TektronixDPOCursor(InstrumentChannel):