Skip to content

Commit

Permalink
Generated gh-pages for commit 2e935d5
Browse files Browse the repository at this point in the history
Merge: c5ccf3c 43250f5
Author: Mikhail Astafev <[email protected]>

    Merge pull request #1366 from astafan8/bug/driver/minicircuits-usb-packet-size
  • Loading branch information
Documentation Bot committed Nov 7, 2018
1 parent 7227738 commit d4b7aee
Show file tree
Hide file tree
Showing 34 changed files with 1,110 additions and 1,058 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_Tutorial_18_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_Tutorial_26_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_Tutorial_30_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_plotting_auto_color_scale_20_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_plotting_auto_color_scale_22_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_plotting_auto_color_scale_24_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/examples_plotting_auto_color_scale_26_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 74 additions & 49 deletions _modules/qcodes/instrument_drivers/Minicircuits/USBHIDMixin.html

Large diffs are not rendered by default.

92 changes: 61 additions & 31 deletions api/generated/qcodes.instrument_drivers.Minicircuits.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/generated/qcodes.measure.Measure.html
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ <h1>qcodes.measure.Measure<a class="headerlink" href="#qcodes-measure-measure" t
</table>
<dl class="attribute">
<dt id="qcodes.measure.Measure.dummy_parameter">
<code class="descname">dummy_parameter</code><em class="property"> = &lt;qcodes.instrument.parameter.Parameter: single at 140660259324984&gt;</em><a class="headerlink" href="#qcodes.measure.Measure.dummy_parameter" title="Permalink to this definition"></a></dt>
<code class="descname">dummy_parameter</code><em class="property"> = &lt;qcodes.instrument.parameter.Parameter: single at 139873542279688&gt;</em><a class="headerlink" href="#qcodes.measure.Measure.dummy_parameter" title="Permalink to this definition"></a></dt>
<dd></dd></dl>

<dl class="method">
Expand Down
38 changes: 19 additions & 19 deletions examples/Combined Parameters.html
Original file line number Diff line number Diff line change
Expand Up @@ -455,17 +455,17 @@ <h2>Simple combined parameters<a class="headerlink" href="#Simple-combined-param
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:23
Started at 2018-11-07 11:37:58
DataSet:
location = &#39;data/2018-11-05/#001_testsweep_14-25-23&#39;
location = &#39;data/2018-11-07/#001_testsweep_11-37-58&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | p1_set | p1 | (11,)
Setpoint | combined_set | combined | (11, 2)
Measured | p4 | p4 | (11, 2)
Measured | p1 | p1 | (11, 2)
Measured | p2 | p2 | (11, 2)
Measured | p3 | p3 | (11, 2)
Finished at 2018-11-05 14:25:23
Finished at 2018-11-07 11:37:58
</pre></div></div>
</div>
<p>The combined_set just stores the indices</p>
Expand Down Expand Up @@ -599,17 +599,17 @@ <h2>Combine and aggregate parameters<a class="headerlink" href="#Combine-and-agg
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:23
Started at 2018-11-07 11:37:58
DataSet:
location = &#39;data/2018-11-05/#002_testsweep_14-25-23&#39;
location = &#39;data/2018-11-07/#002_testsweep_11-37-58&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | p1_set | p1 | (11,)
Setpoint | combined_set | combined | (11, 2)
Measured | p4 | p4 | (11, 2)
Measured | p1 | p1 | (11, 2)
Measured | p2 | p2 | (11, 2)
Measured | p3 | p3 | (11, 2)
Finished at 2018-11-05 14:25:23
Finished at 2018-11-07 11:37:58
</pre></div></div>
</div>
<p>the combined_set now stores the aggregated values</p>
Expand Down Expand Up @@ -663,43 +663,43 @@ <h2>Combine and aggregate parameters<a class="headerlink" href="#Combine-and-agg
(&#39;unit&#39;, &#39;a.u&#39;),
(&#39;label&#39;, &#39;Sum&#39;),
(&#39;full_name&#39;, &#39;combined&#39;),
(&#39;aggregator&#39;, &#39;&lt;function linear at 0x7fbdcf5f7d90&gt;&#39;),
(&#39;aggregator&#39;, &#39;&lt;function linear at 0x7f7fb4537ae8&gt;&#39;),
(&#39;p1&#39;,
{&#39;value&#39;: 2.0,
&#39;ts&#39;: &#39;2018-11-05 14:25:23&#39;,
&#39;ts&#39;: &#39;2018-11-07 11:37:58&#39;,
&#39;raw_value&#39;: 2.0,
&#39;__class__&#39;: &#39;qcodes.instrument.parameter.ManualParameter&#39;,
&#39;full_name&#39;: &#39;p1&#39;,
&#39;post_delay&#39;: 0,
&#39;label&#39;: &#39;p1&#39;,
&#39;name&#39;: &#39;p1&#39;,
&#39;inter_delay&#39;: 0,
&#39;vals&#39;: &#39;&lt;Numbers -10&lt;=v&lt;=10&gt;&#39;,
&#39;unit&#39;: &#39;&#39;,
&#39;label&#39;: &#39;p1&#39;,
&#39;post_delay&#39;: 0}),
&#39;vals&#39;: &#39;&lt;Numbers -10&lt;=v&lt;=10&gt;&#39;}),
(&#39;p2&#39;,
{&#39;value&#39;: 2.0,
&#39;ts&#39;: &#39;2018-11-05 14:25:23&#39;,
&#39;ts&#39;: &#39;2018-11-07 11:37:58&#39;,
&#39;raw_value&#39;: 2.0,
&#39;__class__&#39;: &#39;qcodes.instrument.parameter.ManualParameter&#39;,
&#39;full_name&#39;: &#39;p2&#39;,
&#39;post_delay&#39;: 0,
&#39;label&#39;: &#39;p2&#39;,
&#39;name&#39;: &#39;p2&#39;,
&#39;inter_delay&#39;: 0,
&#39;vals&#39;: &#39;&lt;Numbers -10&lt;=v&lt;=10&gt;&#39;,
&#39;unit&#39;: &#39;&#39;,
&#39;label&#39;: &#39;p2&#39;,
&#39;post_delay&#39;: 0}),
&#39;vals&#39;: &#39;&lt;Numbers -10&lt;=v&lt;=10&gt;&#39;}),
(&#39;p3&#39;,
{&#39;value&#39;: 2.0,
&#39;ts&#39;: &#39;2018-11-05 14:25:23&#39;,
&#39;ts&#39;: &#39;2018-11-07 11:37:58&#39;,
&#39;raw_value&#39;: 2.0,
&#39;__class__&#39;: &#39;qcodes.instrument.parameter.ManualParameter&#39;,
&#39;full_name&#39;: &#39;p3&#39;,
&#39;post_delay&#39;: 0,
&#39;label&#39;: &#39;p3&#39;,
&#39;name&#39;: &#39;p3&#39;,
&#39;inter_delay&#39;: 0,
&#39;vals&#39;: &#39;&lt;Numbers -10&lt;=v&lt;=10&gt;&#39;,
&#39;unit&#39;: &#39;&#39;,
&#39;label&#39;: &#39;p3&#39;,
&#39;post_delay&#39;: 0})])
&#39;vals&#39;: &#39;&lt;Numbers -10&lt;=v&lt;=10&gt;&#39;})])
</pre></div>
</div>
</div>
Expand Down
42 changes: 21 additions & 21 deletions examples/Comprehensive Plotting How-To.html
Original file line number Diff line number Diff line change
Expand Up @@ -1244,20 +1244,20 @@ <h3>Simple 1D sweep<a class="headerlink" href="#Simple-1D-sweep" title="Permalin
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div id='e34793b5-9392-45d6-a5bc-a69c2f52661b'></div></div>
<div id='45f11477-0089-4f7c-aad5-048ad2074c0d'></div></div>
</div>
<div class="nboutput nblast docutils container">
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:27
Started at 2018-11-07 11:38:02
DataSet:
location = &#39;data/2018-11-05/#003_test_plotting_1D_14-25-27&#39;
location = &#39;data/2018-11-07/#003_test_plotting_1D_11-38-02&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | sweep_val_set | sweep_val | (21,)
Measured | measured_val | measured_val | (21,)
Finished at 2018-11-05 14:25:29
Finished at 2018-11-07 11:38:04
</pre></div></div>
</div>
</div>
Expand Down Expand Up @@ -2089,21 +2089,21 @@ <h3>Subplots<a class="headerlink" href="#Subplots" title="Permalink to this head
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div id='df77e85a-af70-4647-b372-e402a132635f'></div></div>
<div id='35f47e67-a54d-495d-9262-8657db6cc3dd'></div></div>
</div>
<div class="nboutput nblast docutils container">
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:30
Started at 2018-11-07 11:38:04
DataSet:
location = &#39;data/2018-11-05/#004_test_plotting_1D_2_14-25-29&#39;
location = &#39;data/2018-11-07/#004_test_plotting_1D_2_11-38-04&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | sweep_val_set | sweep_val | (21,)
Measured | measured_val | measured_val | (21,)
Measured | measured_val_2 | measured_val_2 | (21,)
Finished at 2018-11-05 14:25:34
Finished at 2018-11-07 11:38:08
</pre></div></div>
</div>
<p>The data arrays don’t all have to be passed along during initialization
Expand Down Expand Up @@ -2920,21 +2920,21 @@ <h3>Subplots<a class="headerlink" href="#Subplots" title="Permalink to this head
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div id='ec87908f-8c65-4885-9be4-1acc14110123'></div></div>
<div id='490e7bd8-334b-4b2c-89df-d6d49ad9f0a0'></div></div>
</div>
<div class="nboutput nblast docutils container">
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:34
Started at 2018-11-07 11:38:08
DataSet:
location = &#39;data/2018-11-05/#005_test_plotting_1D_3_14-25-34&#39;
location = &#39;data/2018-11-07/#005_test_plotting_1D_3_11-38-08&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | sweep_val_set | sweep_val | (21,)
Measured | measured_val | measured_val | (21,)
Measured | measured_val_2 | measured_val_2 | (21,)
Finished at 2018-11-05 14:25:38
Finished at 2018-11-07 11:38:12
</pre></div></div>
</div>
<p>Note that we passed the kwarg <code class="docutils literal notranslate"><span class="pre">subplots=3</span></code> to specify that we need 3
Expand Down Expand Up @@ -3770,21 +3770,21 @@ <h3>2D Plots<a class="headerlink" href="#2D-Plots" title="Permalink to this head
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div id='da5094e4-3968-44aa-9288-e9e38ad0fffe'></div></div>
<div id='ab22d7a8-1101-48fb-9584-16959270e70c'></div></div>
</div>
<div class="nboutput nblast docutils container">
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:38
Started at 2018-11-07 11:38:13
DataSet:
location = &#39;data/2018-11-05/#006_test_plotting_2D_14-25-38&#39;
location = &#39;data/2018-11-07/#006_test_plotting_2D_11-38-12&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | sweep_val_set | sweep_val | (21,)
Setpoint | sweep_val_2_set | sweep_val_2 | (21, 11)
Measured | measured_val | measured_val | (21, 11)
Finished at 2018-11-05 14:25:45
Finished at 2018-11-07 11:38:20
</pre></div></div>
</div>
<p>In the example above, the colorbar can be accessed via
Expand Down Expand Up @@ -4607,21 +4607,21 @@ <h3>Interfacing with Matplotlib<a class="headerlink" href="#Interfacing-with-Mat
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div id='3b07c6d5-7a44-46a5-8a20-0e7ff41373a0'></div></div>
<div id='2bd9ebdc-dd65-4d42-9d15-e40cfaf2b88e'></div></div>
</div>
<div class="nboutput nblast docutils container">
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
Started at 2018-11-05 14:25:46
Started at 2018-11-07 11:38:20
DataSet:
location = &#39;data/2018-11-05/#007_test_plotting_2D_2_14-25-45&#39;
location = &#39;data/2018-11-07/#007_test_plotting_2D_2_11-38-20&#39;
&lt;Type&gt; | &lt;array_id&gt; | &lt;array.name&gt; | &lt;array.shape&gt;
Setpoint | sweep_val_set | sweep_val | (21,)
Setpoint | sweep_val_2_set | sweep_val_2 | (21, 11)
Measured | measured_val | measured_val | (21, 11)
Finished at 2018-11-05 14:25:53
Finished at 2018-11-07 11:38:27
</pre></div></div>
</div>
<p>To use the matplotlib api, we need access to the matplotlib Figure and
Expand Down Expand Up @@ -5495,7 +5495,7 @@ <h3>Event handling<a class="headerlink" href="#Event-handling" title="Permalink
<div class="prompt empty docutils container">
</div>
<div class="output_area docutils container">
<div id='a4efb7ab-7bdf-47ec-b17b-3686894587e1'></div></div>
<div id='972047d3-ddb0-4ca1-ac16-50003ff8b94c'></div></div>
</div>
<p>On a related note, matplotlib also has widgets that can be added to
plots, allowing additional interactivity with the dataset. An example
Expand Down
26 changes: 13 additions & 13 deletions examples/DataSet/Benchmarking.html
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,8 @@ <h2>Baseline: Generate data<a class="headerlink" href="#Baseline:-Generate-data"
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
CPU times: user 24.3 ms, sys: 4.05 ms, total: 28.4 ms
Wall time: 23 ms
CPU times: user 33.4 ms, sys: 7.67 ms, total: 41.1 ms
Wall time: 30.4 ms
</pre></div></div>
</div>
<p>and store in memory</p>
Expand Down Expand Up @@ -554,8 +554,8 @@ <h2>Baseline: Generate data<a class="headerlink" href="#Baseline:-Generate-data"
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
CPU times: user 21 ms, sys: 130 µs, total: 21.1 ms
Wall time: 16.5 ms
CPU times: user 21.3 ms, sys: 674 µs, total: 21.9 ms
Wall time: 17.2 ms
</pre></div></div>
</div>
</div>
Expand Down Expand Up @@ -593,8 +593,8 @@ <h2>Add to dataset inside double loop<a class="headerlink" href="#Add-to-dataset
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
CPU times: user 1.92 s, sys: 645 ms, total: 2.57 s
Wall time: 5.47 s
CPU times: user 1.87 s, sys: 654 ms, total: 2.52 s
Wall time: 5.61 s
</pre></div></div>
</div>
</div>
Expand Down Expand Up @@ -636,8 +636,8 @@ <h2>Add the data in outer loop and store as np array<a class="headerlink" href="
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
CPU times: user 309 ms, sys: 52 ms, total: 361 ms
Wall time: 802 ms
CPU times: user 284 ms, sys: 67.9 ms, total: 352 ms
Wall time: 790 ms
</pre></div></div>
</div>
</div>
Expand Down Expand Up @@ -679,8 +679,8 @@ <h2>Save once after loop<a class="headerlink" href="#Save-once-after-loop" title
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
CPU times: user 29.6 ms, sys: 3.22 ms, total: 32.8 ms
Wall time: 43.5 ms
CPU times: user 27.6 ms, sys: 7.95 ms, total: 35.6 ms
Wall time: 43.1 ms
</pre></div></div>
</div>
</div>
Expand Down Expand Up @@ -717,7 +717,7 @@ <h2>Array parameter<a class="headerlink" href="#Array-parameter" title="Permalin
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
763 ms ± 6.04 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)
789 ms ± 18.1 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)
</pre></div></div>
</div>
<div class="nbinput nblast docutils container">
Expand Down Expand Up @@ -765,7 +765,7 @@ <h2>Array parameter<a class="headerlink" href="#Array-parameter" title="Permalin
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
10.9 ms ± 188 µs per loop (mean ± std. dev. of 7 runs, 100 loops each)
10.9 ms ± 90.3 µs per loop (mean ± std. dev. of 7 runs, 100 loops each)
</pre></div></div>
</div>
</div>
Expand Down Expand Up @@ -812,7 +812,7 @@ <h2>Insert many<a class="headerlink" href="#Insert-many" title="Permalink to thi
</div>
<div class="output_area docutils container">
<div class="highlight"><pre>
46.2 ms ± 413 µs per loop (mean ± std. dev. of 7 runs, 10 loops each)
47.3 ms ± 368 µs per loop (mean ± std. dev. of 7 runs, 10 loops each)
</pre></div></div>
</div>
<div class="nbinput nblast docutils container">
Expand Down
Loading

0 comments on commit d4b7aee

Please sign in to comment.