Skip to content
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

Use correct sense function for sense parameters in Keysight 344xxA driver #6723

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use correct sense function for sense parameters in Keysight 344xxA driver #6723

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9572c6d
Use correct sense function for sense parameters
janekfleper Dec 16, 2024
7578b6f
Don't use partial for NPLC
janekfleper Dec 16, 2024
202d45a
Use the get function for the get_cmd of NPLC
janekfleper Dec 17, 2024
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
40 changes: 29 additions & 11 deletions src/qcodes/instrument_drivers/Keysight/private/Keysight_344xxA_submodules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
)

if TYPE_CHECKING:
from collections.abc import Sequence
from collections.abc import Sequence, Callable

from typing_extensions import Unpack

Expand Down Expand Up @@ -748,7 +748,7 @@ def __init__(

self.NPLC: Parameter = self.add_parameter(
"NPLC",
get_cmd="SENSe:VOLTage:DC:NPLC?",
get_cmd=self._get_with_sense_function("NPLC"),
get_parser=float,
set_cmd=self._set_NPLC,
vals=vals.Enum(*self.NPLC_list),
Expand Down Expand Up @@ -836,8 +836,8 @@ def __init__(
self.autorange: Parameter = self.add_parameter(
"autorange",
label="Autorange",
set_cmd="SENSe:VOLTage:DC:RANGe:AUTO {}",
get_cmd="SENSe:VOLTage:DC:RANGe:AUTO?",
set_cmd=self._set_with_sense_function("RANGe:AUTO"),
get_cmd=self._get_with_sense_function("RANGe:AUTO"),
val_mapping={"ON": 1, "OFF": 0},
vals=vals.Enum("ON", "OFF"),
)
Expand All @@ -846,8 +846,8 @@ def __init__(
self.autozero: Parameter = self.add_parameter(
"autozero",
label="Autozero",
set_cmd="SENSe:VOLTage:DC:ZERO:AUTO {}",
get_cmd="SENSe:VOLTage:DC:ZERO:AUTO?",
set_cmd=self._set_with_sense_function("ZERO:AUTO"),
get_cmd=self._get_with_sense_function("ZERO:AUTO"),
val_mapping={"ON": 1, "OFF": 0, "ONCE": "ONCE"},
vals=vals.Enum("ON", "OFF", "ONCE"),
docstring=textwrap.dedent(
Expand Down Expand Up @@ -932,8 +932,8 @@ def __init__(
self.aperture_mode: Parameter = self.add_parameter(
"aperture_mode",
label="Aperture mode",
set_cmd="SENSe:VOLTage:DC:APERture:ENABled {}",
get_cmd="SENSe:VOLTage:DC:APERture:ENABled?",
set_cmd=self._set_with_sense_function("APERture:ENABled"),
get_cmd=self._get_with_sense_function("APERture:ENABled"),
val_mapping={"ON": 1, "OFF": 0},
vals=vals.Enum("ON", "OFF"),
docstring=textwrap.dedent(
Expand All @@ -953,7 +953,7 @@ def __init__(
"aperture_time",
label="Aperture time",
set_cmd=self._set_apt_time,
get_cmd="SENSe:VOLTage:DC:APERture?",
get_cmd=self._get_with_sense_function("APERture"),
get_parser=float,
vals=vals.Numbers(*apt_times[self.model]),
docstring=textwrap.dedent(
Expand Down Expand Up @@ -1212,14 +1212,32 @@ def read(self) -> np.ndarray:
raw_vals: str = self.ask("READ?")
return _raw_vals_to_array(raw_vals)

def _ask_with_sense_function(self, cmd: str) -> str:
function = self.sense_function.get_latest.get_raw().strip("\"")
return self.ask(f"SENSe:{function}:{cmd}?")

def _write_with_sense_function(self, cmd: str, value: str) -> None:
function = self.sense_function.get_latest.get_raw().strip("\"")
self.write(f"SENSe:{function}:{cmd} {value}")

def _get_with_sense_function(self, cmd: str) -> "Callable[[], str]":
def func() -> str:
return self._ask_with_sense_function(cmd)
return func

def _set_with_sense_function(self, cmd: str) -> "Callable[[str], None]":
def func(value: str) -> None:
self._write_with_sense_function(cmd, value)
return func

def _set_apt_time(self, value: float) -> None:
self.write(f"SENSe:VOLTage:DC:APERture {value:f}")
self._write_with_sense_function("APERture", f"{value:f}")

# setting aperture time switches aperture mode ON
self.aperture_mode.get()

def _set_NPLC(self, value: float) -> None:
self.write(f"SENSe:VOLTage:DC:NPLC {value:f}")
self._write_with_sense_function("NPLC", f"{value:f}")

# resolution settings change with NPLC
self.resolution.get()
Expand Down