Skip to content

Commit

Permalink
QDAC2: Use the term "contact" for the connections in an arrangement
Browse files Browse the repository at this point in the history
This change was prompted by discussions with people at the Niels Bohr
Institute to avoid confusion about what can be put into an arrangement.
  • Loading branch information
jpsecher committed Oct 17, 2022
1 parent 00a6947 commit d1382d4
Show file tree
Hide file tree
Showing 7 changed files with 175 additions and 184 deletions.
16 changes: 8 additions & 8 deletions docs/examples/QDevil/QDAC2/Debugging.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 1,
"id": "221a9199",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.4) in 0.23s\n"
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.7) in 0.21s\n"
]
}
],
Expand All @@ -35,7 +35,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 4,
"id": "b936eb6b",
"metadata": {},
"outputs": [
Expand All @@ -51,31 +51,31 @@
"qdac.start_recording_scpi()\n",
"arrangement = qdac.arrange(\n",
" # QDAC channels 1, 2, 3, 4 connected to sample\n",
" gates={'plunger2': 2, 'plunger3': 3},\n",
" contacts={'plunger2': 2, 'plunger3': 3},\n",
" # DMM external trigger connected to QDAC Output Trigger 4\n",
" output_triggers={'dmm': 4})\n",
"pp.pprint(qdac.get_recorded_scpi_commands())"
]
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 5,
"id": "7c425791",
"metadata": {},
"outputs": [],
"source": [
"sweep = arrangement.virtual_sweep2d(\n",
" inner_gate='plunger2',\n",
" inner_contact='plunger2',\n",
" inner_voltages=np.linspace(-0.2, 0.6, 5),\n",
" outer_gate='plunger3',\n",
" outer_contact='plunger3',\n",
" outer_voltages=np.linspace(-0.7, 0.15, 4),\n",
" inner_step_time_s=10e-6,\n",
" inner_step_trigger='dmm')"
]
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 6,
"id": "0319f497",
"metadata": {
"scrolled": false
Expand Down
24 changes: 8 additions & 16 deletions docs/examples/QDevil/QDAC2/GateLeakage.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.4) in 0.21s\n"
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.7) in 0.20s\n"
]
}
],
Expand All @@ -34,21 +34,21 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": 2,
"id": "30e8b591",
"metadata": {},
"outputs": [],
"source": [
"arrangement = qdac.arrange(\n",
" gates={'G1': 1, 'G2': 2, 'G3': 3, 'G4': 4, 'G5': 5})\n",
" contacts={'G1': 1, 'G2': 2, 'G3': 3, 'G4': 4, 'G5': 5})\n",
"arrangement.set_virtual_voltages({\n",
" 'G1': 0.01, 'G2': 0.015, 'G3': 0.013, 'G4': 0.021, 'G5': 0.005})\n",
"sleep(3)"
]
},
{
"cell_type": "code",
"execution_count": 21,
"execution_count": 3,
"id": "be17c0ff",
"metadata": {},
"outputs": [],
Expand All @@ -61,13 +61,13 @@
},
{
"cell_type": "code",
"execution_count": 22,
"execution_count": 4,
"id": "de82ee13",
"metadata": {},
"outputs": [],
"source": [
"leakage_megaohm = leakage_matrix_Ohm / 1e6\n",
"ticks = np.arange(len(arrangement.gate_names))"
"ticks = np.arange(len(arrangement.contact_names))"
]
},
{
Expand All @@ -93,23 +93,15 @@
"plt.title(f'Gate Leakage ({modulation_mV}mV)')\n",
"img = ax.imshow(leakage_megaohm, interpolation='none', vmin=0, vmax=100)\n",
"minorticks = np.arange(-0.5, len(ticks), 1)\n",
"ax.set_xticks(ticks, labels=arrangement.gate_names)\n",
"ax.set_yticks(ticks, labels=arrangement.gate_names)\n",
"ax.set_xticks(ticks, labels=arrangement.contact_names)\n",
"ax.set_yticks(ticks, labels=arrangement.contact_names)\n",
"ax.set_xticks(minorticks, minor=True)\n",
"ax.set_yticks(minorticks, minor=True)\n",
"ax.grid(which='minor', color='grey', linewidth=1.5)\n",
"plt.gca().invert_yaxis()\n",
"colorbar = fig.colorbar(img)\n",
"colorbar.set_label('Resistance (MΩ)')"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "f1f68908",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
14 changes: 7 additions & 7 deletions docs/examples/QDevil/QDAC2/Scan.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"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.05s\n"
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.7) in 0.21s\n",
"Connected to: RIGOL TECHNOLOGIES DS1104Z (serial:DS1ZA171812151, firmware:00.04.03) in 0.01s\n"
]
}
],
Expand Down Expand Up @@ -101,7 +101,7 @@
"source": [
"arrangement = qdac.arrange(\n",
" # QDAC channels 2 & 3 connected to sample\n",
" gates={'plunger2': 2, 'plunger3': 3},\n",
" contacts={'plunger2': 2, 'plunger3': 3},\n",
" # DMM external trigger connected to QDAC Output Trigger 4\n",
" output_triggers={'dmm': 4})"
]
Expand All @@ -115,7 +115,7 @@
"source": [
"# Perform 1D sweep\n",
"sweep = arrangement.virtual_sweep(\n",
" gate='plunger2',\n",
" contact='plunger2',\n",
" voltages=np.linspace(-0.5, 0.5, 25),\n",
" step_time_s=10e-6,\n",
" step_trigger='dmm')"
Expand Down Expand Up @@ -163,9 +163,9 @@
"source": [
"# Perform 2D sweep\n",
"sweep = arrangement.virtual_sweep2d(\n",
" inner_gate='plunger2',\n",
" inner_contact='plunger2',\n",
" inner_voltages=np.linspace(-0.2, 0.6, 5),\n",
" outer_gate='plunger3',\n",
" outer_contact='plunger3',\n",
" outer_voltages=np.linspace(-0.7, 0.15, 4),\n",
" inner_step_time_s=10e-6,\n",
" inner_step_trigger='dmm')"
Expand Down Expand Up @@ -213,7 +213,7 @@
"source": [
"# Perform a detuning by sweeping two times between -0.2 to 0.2 and 0.0 to -0.3\n",
"sweep = arrangement.virtual_detune(\n",
" gates=('plunger2', 'plunger3'), \n",
" contacts=('plunger2', 'plunger3'), \n",
" start_V=(-0.2, 0.0), \n",
" end_V=(0.2, -0.3), \n",
" steps=5,\n",
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/QDevil/QDAC2/Scan2DDiode.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@
"source": [
"arrangement = qdac.arrange(\n",
" # QDAC channels 2 & 3 connected to the ends of two back-to-back Ge diodes\n",
" gates={'diodes_left': 2, 'diodes_right': 3},\n",
" contacts={'diodes_left': 2, 'diodes_right': 3},\n",
" # Internal trigger for measuring current\n",
" internal_triggers={'inner'})\n",
"inner_steps = 21\n",
"inner_V = np.linspace(-0.3, 0.4, inner_steps)\n",
"outer_steps = 21\n",
"outer_V = np.linspace(-0.2, 0.5, outer_steps)\n",
"sweep = arrangement.virtual_sweep2d(\n",
" inner_gate='diodes_left',\n",
" inner_contact='diodes_left',\n",
" inner_voltages=inner_V,\n",
" outer_gate='diodes_right',\n",
" outer_contact='diodes_right',\n",
" outer_voltages=outer_V,\n",
" inner_step_time_s=20e-3,\n",
" inner_step_trigger='inner')\n",
Expand Down
16 changes: 8 additions & 8 deletions docs/examples/QDevil/QDAC2/VirtualGates.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.4) in 0.21s\n",
"Connected to: QDevil QDAC-II (serial:3, firmware:10-1.7) in 0.21s\n",
"Connected to: RIGOL TECHNOLOGIES DS1104Z (serial:DS1ZA171812151, firmware:00.04.03) in 0.01s\n"
]
}
Expand Down Expand Up @@ -107,7 +107,7 @@
"source": [
"arrangement = qdac.arrange(\n",
" # QDAC channels 1, 2, 3, 4 connected to sample\n",
" gates={'sensor1': 1, 'plunger2': 2, 'plunger3': 3, 'plunger4': 4},\n",
" contacts={'sensor1': 1, 'plunger2': 2, 'plunger3': 3, 'plunger4': 4},\n",
" # DMM external trigger connected to QDAC Output Trigger 4\n",
" output_triggers={'dmm': 4})"
]
Expand All @@ -122,9 +122,9 @@
"# Start without correction\n",
"arrangement.set_virtual_voltage('plunger4', 0.1)\n",
"sweep = arrangement.virtual_sweep2d(\n",
" inner_gate='plunger2',\n",
" inner_contact='plunger2',\n",
" inner_voltages=np.linspace(-0.2, 0.6, 5),\n",
" outer_gate='plunger3',\n",
" outer_contact='plunger3',\n",
" outer_voltages=np.linspace(-0.7, 0.15, 4),\n",
" inner_step_time_s=10e-6,\n",
" inner_step_trigger='dmm')"
Expand Down Expand Up @@ -205,9 +205,9 @@
"arrangement.initiate_correction('plunger2', [-0.2, 0.98, 0.3, 0.06])\n",
"arrangement.initiate_correction('plunger3', [0.01, 0.41, 1.0, 0.15])\n",
"sweep = arrangement.virtual_sweep2d(\n",
" inner_gate='plunger2',\n",
" inner_contact='plunger2',\n",
" inner_voltages=np.linspace(-0.2, 0.6, 5),\n",
" outer_gate='plunger3',\n",
" outer_contact='plunger3',\n",
" outer_voltages=np.linspace(-0.7, 0.15, 4),\n",
" inner_step_time_s=10e-6,\n",
" inner_step_trigger='dmm')"
Expand Down Expand Up @@ -287,7 +287,7 @@
"source": [
"# Perform a detuning by sweeping two times between -0.4 to 0.2 and 0.0 to -0.3\n",
"sweep = arrangement.virtual_detune(\n",
" gates=('plunger2', 'plunger3'), \n",
" contacts=('plunger2', 'plunger3'), \n",
" start_V=(-0.4, 0.0), \n",
" end_V=(0.2, -0.3), \n",
" steps=5,\n",
Expand Down Expand Up @@ -330,7 +330,7 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 14,
"id": "b64f2646",
"metadata": {},
"outputs": [
Expand Down
Loading

0 comments on commit d1382d4

Please sign in to comment.