Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions docs/changes/newsfragments/7996.improved_driver
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
The ``TektronixAWG5014`` driver has been refactored to use ``InstrumentChannel``
submodules. Per-channel parameters (e.g. ``amp``, ``offset``, ``state``) are now
accessed via ``awg.ch1.amp`` instead of ``awg.ch1_amp``, and marker parameters
via ``awg.ch1.m1.high`` instead of ``awg.ch1_m1_high``. The old flat attribute
names still work but emit a deprecation warning. The example notebook has been
updated accordingly.
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@
"metadata": {},
"outputs": [],
"source": [
"print(awg1.ch3_state.get())\n",
"print(awg1.ch2_offset.get())\n",
"awg1.ch2_offset.set(0.1)\n",
"print(awg1.ch2_offset.get())"
"print(awg1.ch3.state.get())\n",
"print(awg1.ch2.offset.get())\n",
"awg1.ch2.offset.set(0.1)\n",
"print(awg1.ch2.offset.get())"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"A list of all available parameters can be found in the following manner:"
"The instrument has top-level parameters as well as per-channel parameters accessible via `awg1.ch1`, `awg1.ch2`, etc. Each channel also has marker submodules `m1` and `m2`."
]
},
{
Expand All @@ -100,9 +100,19 @@
"metadata": {},
"outputs": [],
"source": [
"pars = np.sort(list(awg1.parameters.keys()))\n",
"for param in pars:\n",
" print(param, \": \", awg1.parameters[param].label)"
"# Top-level parameters\n",
"for name in sorted(awg1.parameters):\n",
" print(name, \": \", awg1.parameters[name].label)\n",
"\n",
"# Channel parameters (e.g. ch1)\n",
"print(\"\\nChannel 1 parameters:\")\n",
"for name in sorted(awg1.ch1.parameters):\n",
" print(f\" ch1.{name}: \", awg1.ch1.parameters[name].label)\n",
"\n",
"# Marker parameters (e.g. ch1.m1)\n",
"print(\"\\nChannel 1 Marker 1 parameters:\")\n",
"for name in sorted(awg1.ch1.m1.parameters):\n",
" print(f\" ch1.m1.{name}: \", awg1.ch1.m1.parameters[name].label)"
]
},
{
Expand Down
Loading
Loading