Skip to content

Commit

Permalink
Fix typos in two Tektronix channel classes
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshnielsen committed Apr 5, 2024
1 parent d522c68 commit e0fd561
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
22 changes: 7 additions & 15 deletions src/qcodes/instrument_drivers/tektronix/DPO7200xx.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,11 @@ def __init__(

self.add_submodule("channel", channel_list)

self.add_submodule(
"trigger",
TekronixDPOTrigger(self, "trigger")
)
self.add_submodule("trigger", TektronixDPOTrigger(self, "trigger"))

self.add_submodule(
"delayed_trigger",
TekronixDPOTrigger(self, "delayed_trigger", delayed_trigger=True)
TektronixDPOTrigger(self, "delayed_trigger", delayed_trigger=True),
)

self.connect_message()
Expand Down Expand Up @@ -173,7 +170,7 @@ def __init__(
"source",
get_cmd="DATa:SOU?",
set_cmd="DATa:SOU {}",
vals=Enum(*TekronixDPOWaveform.valid_identifiers)
vals=Enum(*TektronixDPOWaveform.valid_identifiers),
)

self.add_parameter(
Expand Down Expand Up @@ -201,7 +198,7 @@ def __init__(
)


class TekronixDPOWaveform(InstrumentChannel):
class TektronixDPOWaveform(InstrumentChannel):
"""
This submodule retrieves data from waveform sources, e.g.
channels.
Expand Down Expand Up @@ -431,10 +428,7 @@ def __init__(
self._identifier = f"CH{channel_number}"

self.add_submodule(
"waveform",
TekronixDPOWaveform(
self, "waveform", self._identifier
)
"waveform", TektronixDPOWaveform(self, "waveform", self._identifier)
)

self.add_parameter(
Expand Down Expand Up @@ -618,7 +612,7 @@ def _set_scale(self, value: float) -> None:
self.write(f"HORizontal:MODE:SCAle {value}")


class TekronixDPOTrigger(InstrumentChannel):
class TektronixDPOTrigger(InstrumentChannel):
"""
Submodule for trigger setup.
Expand Down Expand Up @@ -861,9 +855,7 @@ def __init__(
get_cmd=f"MEASUrement:MEAS{self._measurement_number}:SOUrce"
f"{src}?",
set_cmd=partial(self._set_source, src),
vals=Enum(
*(TekronixDPOWaveform.valid_identifiers + ["HISTogram"])
)
vals=Enum(*(TektronixDPOWaveform.valid_identifiers + ["HISTogram"])),
)

@property
Expand Down
8 changes: 4 additions & 4 deletions src/qcodes/instrument_drivers/tektronix/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
from .AWG70000A import Tektronix70000AWGChannel
from .AWG70002A import TektronixAWG70002A
from .DPO7200xx import (
TekronixDPOTrigger,
TekronixDPOWaveform,
TektronixDPOChannel,
TektronixDPOData,
TektronixDPOHorizontal,
TektronixDPOMeasurement,
TektronixDPOMeasurementParameter,
TektronixDPOMeasurementStatistics,
TektronixDPOModeError,
TektronixDPOTrigger,
TektronixDPOWaveform,
TektronixDPOWaveformFormat,
)
from .Tektronix_70001A import TektronixAWG70001A
Expand All @@ -26,8 +26,8 @@
from .TPS2012 import TektronixTPS2012, TektronixTPS2012Channel

__all__ = [
"TekronixDPOTrigger",
"TekronixDPOWaveform",
"TektronixDPOTrigger",
"TektronixDPOWaveform",
"Tektronix70000AWGChannel",
"TektronixAWG5014",
"TektronixAWG5208",
Expand Down

0 comments on commit e0fd561

Please sign in to comment.