Skip to content

Tektronix DPO7200xx assign modules to types #7611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenshnielsen merged 1 commit into from
Nov 3, 2025
+20 −8
Merged

Tektronix DPO7200xx assign modules to types #7611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/qcodes/instrument_drivers/tektronix/DPO7200xx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,14 @@ def __init__(
self.add_submodule(measurement_name, measurement_module)
measurement_list.append(measurement_module)

self.add_submodule("measurement", measurement_list)
self.add_submodule(
self.measurement: ChannelList[TektronixDPOMeasurement] = self.add_submodule(
"measurement", measurement_list
)
"""Instrument module measurement"""
self.statistics: TektronixDPOMeasurementStatistics = self.add_submodule(
"statistics", TektronixDPOMeasurementStatistics(self, "statistics")
)
"""Instrument module statistics"""

channel_list = ChannelList(self, "channel", TektronixDPOChannel)
for channel_number in range(1, self.number_of_channels + 1):
Expand All @@ -123,7 +127,10 @@ def __init__(
self.add_submodule(channel_name, channel_module)
channel_list.append(channel_module)

self.add_submodule("channel", channel_list)
self.channel: ChannelList[TektronixDPOChannel] = self.add_submodule(
"channel", channel_list
)
"""Instrument module channel"""

self.connect_message()

Expand Down Expand Up @@ -445,9 +452,10 @@ def __init__(
super().__init__(parent, name, **kwargs)
self._identifier = f"CH{channel_number}"

self.add_submodule(
self.waveform: TektronixDPOWaveform = self.add_submodule(
"waveform", TektronixDPOWaveform(self, "waveform", self._identifier)
)
"""Instrument module waveform"""

self.scale: Parameter = self.add_parameter(
"scale",
Expand Down
12 changes: 8 additions & 4 deletions tests/drivers/test_tektronix_dpo7200xx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import sys
import timeit
from typing import TYPE_CHECKING

import pytest

from qcodes.instrument_drivers.tektronix.DPO7200xx import TektronixDPO7000xx

if TYPE_CHECKING:
from collections.abc import Generator


@pytest.fixture(scope="function")
def tektronix_dpo():
def tektronix_dpo() -> "Generator[TektronixDPO7000xx, None, None]":
"""
A six channel-per-relay instrument
"""
Expand All @@ -24,7 +28,7 @@ def tektronix_dpo():
@pytest.mark.xfail(
condition=sys.platform == "win32", reason="Time resolution is too low on windows"
)
def test_adjust_timer(tektronix_dpo) -> None:
def test_adjust_timer(tektronix_dpo: TektronixDPO7000xx) -> None:
"""
After adjusting the type of the measurement or the source of the
measurement, we need wait at least 0.1 seconds
Expand Down Expand Up @@ -54,14 +58,14 @@ def test_adjust_timer(tektronix_dpo) -> None:
# measurements slightly sooner then 'minimum_adjustment_time'


def test_measurements_return_float(tektronix_dpo) -> None:
def test_measurements_return_float(tektronix_dpo: TektronixDPO7000xx) -> None:
amplitude = tektronix_dpo.measurement[0].amplitude()
assert isinstance(amplitude, float)

mean_amplitude = tektronix_dpo.measurement[0].amplitude.mean()
assert isinstance(mean_amplitude, float)


def test_measurement_sets_state(tektronix_dpo) -> None:
def test_measurement_sets_state(tektronix_dpo: TektronixDPO7000xx) -> None:
tektronix_dpo.measurement[1].frequency()
assert tektronix_dpo.measurement[1].state() == 1
Loading