Skip to content

Commit

Permalink
Merge pull request #127 from QDevil/master
Browse files Browse the repository at this point in the history 
Two 2D scan examples & refuse non-identifier instrument name
  • Loading branch information
@astafan8
astafan8 authored Apr 25, 2022
2 parents 155e292 + de2732d commit 78839ee
Show file tree
Hide file tree
Showing 17 changed files with 662 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/AWG.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"import numpy\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Chaining.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/DC_Constant.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Debugging.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')"
"qdac = QDAC2.QDac2('QDAC', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/List.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/MultiGenerator.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Scan2D.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
211 changes: 211 additions & 0 deletions docs/examples/QDevil/QDAC2/Scan2DDiode.ipynb
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Sine.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Square.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Sweep.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/Triangle.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/QDevil/QDAC2/VirtualGates2dScan.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"from IPython.display import Image, display\n",
"from qcodes_contrib_drivers.drivers.QDevil import QDAC2\n",
"qdac_addr = '192.168.8.153'\n",
"qdac = QDAC2.QDac2('QDAC-II', visalib='@py', address=f'TCPIP::{qdac_addr}::5025::SOCKET')\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",
"scope = DS1000Z.DS1074Z('rigol', visalib='@py', address=f'TCPIP::{rigol_addr}::INSTR')"
Expand Down
Loading

0 comments on commit 78839ee

Please sign in to comment.