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

QDevil QDAC2: Update to agree with new firmware #154

Merged
merged 11 commits into from
Sep 9, 2022
Merged

QDevil QDAC2: Update to agree with new firmware #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b7cb0d7
Update to agree with QDAC2 firmware 8-0.19.0
jpsecher Jul 14, 2022
eb971da
Merge remote-tracking branch 'upstream/master'
jpsecher Jul 14, 2022
b2cca8b
Merge remote-tracking branch 'upstream/master'
jpsecher Sep 7, 2022
7570cf7
Accept shorter version numbers
jpsecher Sep 7, 2022
ff52ac5
Always sleep after reset (*RST)
jpsecher Sep 7, 2022
6a18408
Update examples & adjust simulation to only allow 14 triggers
jpsecher Sep 7, 2022
b8a45e6
QDAC2 tests need pytest-mock
jpsecher Sep 8, 2022
0058bf5
Oops, reinstate original requirements
jpsecher Sep 8, 2022
06dde8f
Need pyvisa-py to run the examples (& 0.5.3 is not compatible with qc…
jpsecher Sep 8, 2022
584d1d7
Show effect on non-sweeping gate
jpsecher Sep 8, 2022
7fc1b1f
Show sensor1 on virtual gate example
jpsecher Sep 8, 2022
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
74 changes: 34 additions & 40 deletions docs/examples/QDevil/QDAC2/AWG.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 18 additions & 26 deletions docs/examples/QDevil/QDAC2/Chaining.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"cells": [
{
"cell_type": "markdown",
"id": "a61599bb",
"metadata": {},
"source": [
"# QDAC-II trigger chaining\n"
Expand All @@ -17,17 +18,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Logging hadn't been started.\n",
"Activating auto-logging. Current session state plus future input saved.\n",
"Filename : /Users/jps/.qcodes/logs/command_history.log\n",
"Mode : append\n",
"Output logging : True\n",
"Raw input log : False\n",
"Timestamping : True\n",
"State : active\n",
"Qcodes Logfile : /Users/jps/.qcodes/logs/211109-9928-qcodes.log\n",
"Connected to: QDevil QDAC-II (serial:48762, firmware:5-0.9.26) in 0.38s\n",
"Connected to: RIGOL TECHNOLOGIES DS1104Z (serial:DS1ZA171812151, firmware:00.04.03) in 0.06s\n"
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.4) in 0.23s\n",
"Connected to: RIGOL TECHNOLOGIES DS1104Z (serial:DS1ZA171812151, firmware:00.04.03) in 0.12s\n"
]
}
],
Expand All @@ -36,7 +28,7 @@
"import numpy\n",
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac_addr = '192.168.8.17'\n",
"qdac = QDAC2.QDac2('QDAC', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\n",
"import qcodes.instrument_drivers.rigol.DS1074Z as DS1000Z\n",
"rigol_addr = '192.168.8.199'\n",
Expand All @@ -50,9 +42,8 @@
"metadata": {},
"outputs": [],
"source": [
"qdac.reset()\n",
"scope.write('*rst')\n",
"sleep(3)"
"qdac.reset()"
]
},
{
Expand All @@ -78,11 +69,13 @@
"outputs": [],
"source": [
"scope.write('chan1:disp off')\n",
"# Connect scope ch 3 to qdac ch 3\n",
"scope.write('chan3:disp on')\n",
"scope.write('chan3:bwl on')\n",
"scope.write('chan3:prob 1')\n",
"scope.write('chan3:scal 0.25')\n",
"scope.write('chan3:offs -0.5')\n",
"# Connect scope ch 2 to qdac ch 2\n",
"scope.write('chan2:disp on')\n",
"scope.write('chan2:bwl on')\n",
"scope.write('chan2:prob 1')\n",
Expand Down Expand Up @@ -170,7 +163,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 7,
"id": "6caac7af",
"metadata": {},
"outputs": [
Expand All @@ -180,7 +173,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 8,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -193,7 +186,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 8,
"id": "de8b7d7e",
"metadata": {},
"outputs": [
Expand All @@ -203,7 +196,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 9,
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -239,18 +232,17 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 9,
"id": "270f5158",
"metadata": {},
"outputs": [],
"source": [
"qdac.reset()\n",
"sleep(3)"
"qdac.reset()"
]
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 10,
"id": "3ca0a64b",
"metadata": {},
"outputs": [
Expand All @@ -260,7 +252,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 12,
"execution_count": 10,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -280,7 +272,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 11,
"id": "b057168f",
"metadata": {},
"outputs": [
Expand All @@ -290,7 +282,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 13,
"execution_count": 11,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -340,7 +332,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.5"
"version": "3.8.10"
},
"nbsphinx": {
"execute": "never"
Expand Down
40 changes: 16 additions & 24 deletions docs/examples/QDevil/QDAC2/DC_Constant.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"cells": [
{
"cell_type": "markdown",
"id": "e9a7f941",
"metadata": {},
"source": [
"# QDAC-II constant voltage\n"
Expand All @@ -17,16 +18,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Logging hadn't been started.\n",
"Activating auto-logging. Current session state plus future input saved.\n",
"Filename : /Users/jps/.qcodes/logs/command_history.log\n",
"Mode : append\n",
"Output logging : True\n",
"Raw input log : False\n",
"Timestamping : True\n",
"State : active\n",
"Qcodes Logfile : /Users/jps/.qcodes/logs/211109-10602-qcodes.log\n",
"Connected to: QDevil QDAC-II (serial:48762, firmware:5-0.9.26) in 0.33s\n",
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.4) in 0.21s\n",
"Connected to: RIGOL TECHNOLOGIES DS1104Z (serial:DS1ZA171812151, firmware:00.04.03) in 0.04s\n"
]
}
Expand All @@ -35,7 +27,7 @@
"from time import sleep\n",
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac_addr = '192.168.8.17'\n",
"qdac = QDAC2.QDac2('QDAC', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\n",
"import qcodes.instrument_drivers.rigol.DS1074Z as DS1000Z\n",
"rigol_addr = '192.168.8.199'\n",
Expand All @@ -44,19 +36,18 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 10,
"id": "2445e79b",
"metadata": {},
"outputs": [],
"source": [
"qdac.reset()\n",
"scope.write('*rst')\n",
"sleep(2)"
"qdac.reset()"
]
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 11,
"id": "2604ede8",
"metadata": {},
"outputs": [],
Expand All @@ -71,11 +62,12 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 12,
"id": "a94241be",
"metadata": {},
"outputs": [],
"source": [
"# Connect scope ch 3 to qdac ch 3\n",
"scope.write('chan1:disp off')\n",
"scope.write('chan3:disp on')\n",
"scope.write('chan3:bwl on')\n",
Expand All @@ -88,7 +80,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 13,
"id": "a829c230",
"metadata": {},
"outputs": [
Expand All @@ -98,7 +90,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 5,
"execution_count": 13,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -133,7 +125,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 14,
"id": "8207bd8c",
"metadata": {},
"outputs": [
Expand All @@ -143,7 +135,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 7,
"execution_count": 14,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -179,7 +171,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 15,
"id": "826a1472",
"metadata": {},
"outputs": [],
Expand All @@ -194,7 +186,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 16,
"id": "46277cc2",
"metadata": {},
"outputs": [
Expand All @@ -204,7 +196,7 @@
"'0, \"No error\"'"
]
},
"execution_count": 10,
"execution_count": 16,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -256,7 +248,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.5"
"version": "3.8.10"
},
"nbsphinx": {
"execute": "never"
Expand Down
Loading