Skip to content

Commit 25651c0

Browse files
author
Documentation Bot
committed
Generated gh-pages for commit 8033c88
Author: Jens Hedegaard Nielsen <[email protected]> Fix parameter warnings (#776)
1 parent 5446bc5 commit 25651c0

File tree

16 files changed

+52
-58
lines changed

16 files changed

+52
-58
lines changed

_modules/qcodes/instrument/parameter.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,11 @@ <h1>Source code for qcodes.instrument.parameter</h1><div class="highlight"><pre>
679679
<span class="c1"># Deprecated</span>
680680
<span class="nd">@property</span>
681681
<span class="k">def</span> <span class="nf">full_name</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
682-
<span class="n">warnings</span><span class="o">.</span><span class="n">warn</span><span class="p">(</span><span class="s1">&#39;Attribute `full_name` is deprecated, please use &#39;</span>
683-
<span class="s1">&#39;str(parameter)&#39;</span><span class="p">)</span>
682+
<span class="c1"># This can fully be replaced by str(parameter) in the future we</span>
683+
<span class="c1"># may want to deprecate this but the current dataset makes heavy use</span>
684+
<span class="c1"># of it in more complicated ways so keep it for now.</span>
685+
<span class="c1"># warnings.warn(&#39;Attribute `full_name` is deprecated, please use &#39;</span>
686+
<span class="c1"># &#39;str(parameter)&#39;)</span>
684687
<span class="k">return</span> <span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
685688

686689
<span class="k">def</span> <span class="nf">set_validator</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">vals</span><span class="p">):</span>

_modules/qcodes/instrument_drivers/Harvard/Decadac.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<h1>Source code for qcodes.instrument_drivers.Harvard.Decadac</h1><div class="highlight"><pre>
166166
<span></span><span class="kn">from</span> <span class="nn">time</span> <span class="k">import</span> <span class="n">time</span>
167167
<span class="kn">from</span> <span class="nn">functools</span> <span class="k">import</span> <span class="n">partial</span>
168-
<span class="kn">from</span> <span class="nn">qcodes</span> <span class="k">import</span> <span class="n">VisaInstrument</span><span class="p">,</span> <span class="n">InstrumentChannel</span><span class="p">,</span> <span class="n">ChannelList</span><span class="p">,</span> <span class="n">ManualParameter</span>
168+
<span class="kn">from</span> <span class="nn">qcodes</span> <span class="k">import</span> <span class="n">VisaInstrument</span><span class="p">,</span> <span class="n">InstrumentChannel</span><span class="p">,</span> <span class="n">ChannelList</span>
169169
<span class="kn">from</span> <span class="nn">qcodes.utils</span> <span class="k">import</span> <span class="n">validators</span> <span class="k">as</span> <span class="n">vals</span>
170170

171171

@@ -364,9 +364,9 @@ <h1>Source code for qcodes.instrument_drivers.Harvard.Decadac</h1><div class="hi
364364

365365
<span class="c1"># Manual parameters to control whether DAC channels should ramp to voltages or jump</span>
366366
<span class="bp">self</span><span class="o">.</span><span class="n">_ramp_val</span> <span class="o">=</span> <span class="n">vals</span><span class="o">.</span><span class="n">Numbers</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">10</span><span class="p">)</span>
367-
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="s2">&quot;enable_ramp&quot;</span><span class="p">,</span> <span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span> <span class="n">initial_value</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
367+
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="s2">&quot;enable_ramp&quot;</span><span class="p">,</span> <span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">initial_value</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
368368
<span class="n">vals</span><span class="o">=</span><span class="n">vals</span><span class="o">.</span><span class="n">Bool</span><span class="p">())</span>
369-
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="s2">&quot;ramp_rate&quot;</span><span class="p">,</span> <span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span> <span class="n">initial_value</span><span class="o">=</span><span class="mf">0.1</span><span class="p">,</span>
369+
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="s2">&quot;ramp_rate&quot;</span><span class="p">,</span> <span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">initial_value</span><span class="o">=</span><span class="mf">0.1</span><span class="p">,</span>
370370
<span class="n">vals</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_ramp_val</span><span class="p">,</span> <span class="n">unit</span><span class="o">=</span><span class="s2">&quot;V/s&quot;</span><span class="p">)</span>
371371

372372
<span class="c1"># Add ramp function to the list of functions</span>

_modules/qcodes/instrument_drivers/QDev/QDac.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac</h1><div class="highligh
175175
<span class="kn">from</span> <span class="nn">operator</span> <span class="k">import</span> <span class="n">xor</span>
176176
<span class="kn">from</span> <span class="nn">collections</span> <span class="k">import</span> <span class="n">OrderedDict</span>
177177

178-
<span class="kn">from</span> <span class="nn">qcodes.instrument.parameter</span> <span class="k">import</span> <span class="n">ManualParameter</span>
179178
<span class="kn">from</span> <span class="nn">qcodes.instrument.visa</span> <span class="k">import</span> <span class="n">VisaInstrument</span>
180179
<span class="kn">from</span> <span class="nn">qcodes.utils</span> <span class="k">import</span> <span class="n">validators</span> <span class="k">as</span> <span class="n">vals</span>
181180

@@ -294,13 +293,13 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac</h1><div class="highligh
294293
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;ch</span><span class="si">{:02}</span><span class="s1">_sync_delay&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">i</span><span class="p">),</span>
295294
<span class="n">label</span><span class="o">=</span><span class="s1">&#39;Channel </span><span class="si">{}</span><span class="s1"> sync pulse delay&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">i</span><span class="p">),</span>
296295
<span class="n">unit</span><span class="o">=</span><span class="s1">&#39;s&#39;</span><span class="p">,</span>
297-
<span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span>
296+
<span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
298297
<span class="n">initial_value</span><span class="o">=</span><span class="mi">0</span><span class="p">)</span>
299298

300299
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;ch</span><span class="si">{:02}</span><span class="s1">_sync_duration&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">i</span><span class="p">),</span>
301300
<span class="n">label</span><span class="o">=</span><span class="s1">&#39;Channel </span><span class="si">{}</span><span class="s1"> sync pulse duration&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">i</span><span class="p">),</span>
302301
<span class="n">unit</span><span class="o">=</span><span class="s1">&#39;s&#39;</span><span class="p">,</span>
303-
<span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span>
302+
<span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
304303
<span class="n">initial_value</span><span class="o">=</span><span class="mf">0.01</span><span class="p">)</span>
305304

306305
<span class="k">for</span> <span class="n">board</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">6</span><span class="p">):</span>
@@ -323,7 +322,7 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac</h1><div class="highligh
323322

324323
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;fast_voltage_set&#39;</span><span class="p">,</span>
325324
<span class="n">label</span><span class="o">=</span><span class="s1">&#39;fast voltage set&#39;</span><span class="p">,</span>
326-
<span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span>
325+
<span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
327326
<span class="n">vals</span><span class="o">=</span><span class="n">vals</span><span class="o">.</span><span class="n">Bool</span><span class="p">(),</span>
328327
<span class="n">initial_value</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
329328
<span class="n">docstring</span><span class="o">=</span><span class="s2">&quot;&quot;&quot;&quot;Toggles if DC voltage set should unset any ramp attached to this channel.</span>

_modules/qcodes/instrument_drivers/QDev/QDac_channels.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac_channels</h1><div class=
177177

178178
<span class="kn">from</span> <span class="nn">qcodes.instrument.channel</span> <span class="k">import</span> <span class="n">InstrumentChannel</span><span class="p">,</span> <span class="n">ChannelList</span>
179179
<span class="kn">from</span> <span class="nn">qcodes.instrument.channel</span> <span class="k">import</span> <span class="n">MultiChannelInstrumentParameter</span>
180-
<span class="kn">from</span> <span class="nn">qcodes.instrument.parameter</span> <span class="k">import</span> <span class="n">ManualParameter</span>
181180
<span class="kn">from</span> <span class="nn">qcodes.instrument.visa</span> <span class="k">import</span> <span class="n">VisaInstrument</span>
182181
<span class="kn">from</span> <span class="nn">qcodes.utils</span> <span class="k">import</span> <span class="n">validators</span> <span class="k">as</span> <span class="n">vals</span>
183182

@@ -258,14 +257,14 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac_channels</h1><div class=
258257
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;sync_delay&#39;</span><span class="p">,</span>
259258
<span class="n">label</span><span class="o">=</span><span class="s1">&#39;Channel </span><span class="si">{}</span><span class="s1"> sync pulse delay&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">channum</span><span class="p">),</span>
260259
<span class="n">unit</span><span class="o">=</span><span class="s1">&#39;s&#39;</span><span class="p">,</span>
261-
<span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span>
260+
<span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
262261
<span class="n">initial_value</span><span class="o">=</span><span class="mi">0</span>
263262
<span class="p">)</span>
264263

265264
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;sync_duration&#39;</span><span class="p">,</span>
266265
<span class="n">label</span><span class="o">=</span><span class="s1">&#39;Channel </span><span class="si">{}</span><span class="s1"> sync pulse duration&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">channum</span><span class="p">),</span>
267266
<span class="n">unit</span><span class="o">=</span><span class="s1">&#39;s&#39;</span><span class="p">,</span>
268-
<span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span>
267+
<span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
269268
<span class="n">initial_value</span><span class="o">=</span><span class="mf">0.01</span>
270269
<span class="p">)</span>
271270

@@ -411,7 +410,7 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac_channels</h1><div class=
411410

412411
<span class="bp">self</span><span class="o">.</span><span class="n">add_parameter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s1">&#39;fast_voltage_set&#39;</span><span class="p">,</span>
413412
<span class="n">label</span><span class="o">=</span><span class="s1">&#39;fast voltage set&#39;</span><span class="p">,</span>
414-
<span class="n">parameter_class</span><span class="o">=</span><span class="n">ManualParameter</span><span class="p">,</span>
413+
<span class="n">get_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">set_cmd</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
415414
<span class="n">vals</span><span class="o">=</span><span class="n">vals</span><span class="o">.</span><span class="n">Bool</span><span class="p">(),</span>
416415
<span class="n">initial_value</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
417416
<span class="n">docstring</span><span class="o">=</span><span class="s2">&quot;&quot;&quot;&quot;Deprecated with no functionality&quot;&quot;&quot;</span><span class="p">)</span>

0 commit comments

Comments
 (0)