Generated gh-pages for commit 41ce6d8

Author: Jens Hedegaard Nielsen <[email protected]>

    Faster qdac (#53) (#730)

_modules/qcodes/instrument_drivers/QDev/QDac.html

@@ -321,6 +321,14 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac</h1><div class="highligh
                            <span class="n">set_cmd</span><span class="o">=</span><span class="s1">&#39;ver </span><span class="si">{}</span><span class="s1">&#39;</span><span class="p">,</span>
                            <span class="n">val_mapping</span><span class="o">=</span><span class="p">{</span><span class="kc">True</span><span class="p">:</span> <span class="mi">1</span><span class="p">,</span> <span class="kc">False</span><span class="p">:</span> <span class="mi">0</span><span class="p">})</span>
 
+        <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>
+                           <span class="n">label</span><span class="o">=</span><span class="s1">&#39;fast voltage set&#39;</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">vals</span><span class="o">=</span><span class="n">vals</span><span class="o">.</span><span class="n">Bool</span><span class="p">(),</span>
+                           <span class="n">initial_value</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+                           <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>
+<span class="s2">                                     If you enable this you should ensure thay any function generator is unset</span>
+<span class="s2">                                     from the channel before setting voltage&quot;&quot;&quot;</span><span class="p">)</span>
         <span class="c1"># Initialise the instrument, all channels DC (unbind func. generators)</span>
         <span class="k">for</span> <span class="n">chan</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">chan_range</span><span class="p">:</span>
             <span class="c1"># Note: this call does NOT change the voltage on the channel</span>
@@ -373,17 +381,18 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac</h1><div class="highligh
             <span class="bp">self</span><span class="o">.</span><span class="n">_assigned_fgs</span><span class="p">[</span><span class="n">chan</span><span class="p">]</span> <span class="o">=</span> <span class="n">fg</span>
             <span class="c1"># We need .get and not get_latest in case a ramp was interrupted</span>
             <span class="n">v_start</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">parameters</span><span class="p">[</span><span class="s1">&#39;ch</span><span class="si">{:02}</span><span class="s1">_v&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">)]</span><span class="o">.</span><span class="n">get</span><span class="p">()</span>
-            <span class="n">time</span> <span class="o">=</span> <span class="nb">abs</span><span class="p">(</span><span class="n">v_set</span><span class="o">-</span><span class="n">v_start</span><span class="p">)</span><span class="o">/</span><span class="n">slope</span>
-            <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s1">&#39;Slope: </span><span class="si">{}</span><span class="s1">, time: </span><span class="si">{}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">slope</span><span class="p">,</span> <span class="n">time</span><span class="p">))</span>
+            <span class="n">mytime</span> <span class="o">=</span> <span class="nb">abs</span><span class="p">(</span><span class="n">v_set</span><span class="o">-</span><span class="n">v_start</span><span class="p">)</span><span class="o">/</span><span class="n">slope</span>
+            <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s1">&#39;Slope: </span><span class="si">{}</span><span class="s1">, time: </span><span class="si">{}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">slope</span><span class="p">,</span> <span class="n">mytime</span><span class="p">))</span>
             <span class="c1"># Attenuation compensation and syncing</span>
             <span class="c1"># happen inside _rampvoltage</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">_rampvoltage</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="n">fg</span><span class="p">,</span> <span class="n">v_start</span><span class="p">,</span> <span class="n">v_set</span><span class="p">,</span> <span class="n">time</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_rampvoltage</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="n">fg</span><span class="p">,</span> <span class="n">v_start</span><span class="p">,</span> <span class="n">v_set</span><span class="p">,</span> <span class="n">mytime</span><span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="c1"># compensate for the 0.1 multiplier, if it&#39;s on</span>
             <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">parameters</span><span class="p">[</span><span class="s1">&#39;ch</span><span class="si">{:02}</span><span class="s1">_vrange&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">)]</span><span class="o">.</span><span class="n">get_latest</span><span class="p">()</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
                 <span class="n">v_set</span> <span class="o">=</span> <span class="n">v_set</span><span class="o">*</span><span class="mi">10</span>
             <span class="c1"># set the mode back to DC in case it had been changed</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s1">&#39;wav </span><span class="si">{}</span><span class="s1"> 0 0 0&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">))</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">fast_voltage_set</span><span class="p">():</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s1">&#39;wav </span><span class="si">{}</span><span class="s1"> 0 0 0&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">))</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s1">&#39;set </span><span class="si">{}</span><span class="s1"> </span><span class="si">{:.6f}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="n">v_set</span><span class="p">))</span>
 
     <span class="k">def</span> <span class="nf">_set_vrange</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">chan</span><span class="p">,</span> <span class="n">switchint</span><span class="p">):</span>

_modules/qcodes/instrument_drivers/QDev/QDac_channels.html

@@ -409,6 +409,14 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac_channels</h1><div class=
                            <span class="n">set_cmd</span><span class="o">=</span><span class="s1">&#39;ver </span><span class="si">{}</span><span class="s1">&#39;</span><span class="p">,</span>
                            <span class="n">val_mapping</span><span class="o">=</span><span class="p">{</span><span class="kc">True</span><span class="p">:</span> <span class="mi">1</span><span class="p">,</span> <span class="kc">False</span><span class="p">:</span> <span class="mi">0</span><span class="p">})</span>
 
+        <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>
+                           <span class="n">label</span><span class="o">=</span><span class="s1">&#39;fast voltage set&#39;</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">vals</span><span class="o">=</span><span class="n">vals</span><span class="o">.</span><span class="n">Bool</span><span class="p">(),</span>
+                           <span class="n">initial_value</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+                           <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>
+<span class="s2">                                     If you enable this you should ensure that any function generator is unset</span>
+<span class="s2">                                     from the channel before setting voltage&quot;&quot;&quot;</span><span class="p">)</span>
         <span class="c1"># Initialise the instrument, all channels DC (unbind func. generators)</span>
         <span class="k">for</span> <span class="n">chan</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">chan_range</span><span class="p">:</span>
             <span class="c1"># Note: this call does NOT change the voltage on the channel</span>
@@ -479,7 +487,8 @@ <h1>Source code for qcodes.instrument_drivers.QDev.QDac_channels</h1><div class=
             <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">channels</span><span class="p">[</span><span class="n">chan</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span><span class="o">.</span><span class="n">vrange</span><span class="o">.</span><span class="n">get_latest</span><span class="p">()</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
                 <span class="n">v_set</span> <span class="o">=</span> <span class="n">v_set</span><span class="o">*</span><span class="mi">10</span>
             <span class="c1"># set the mode back to DC in case it had been changed</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s1">&#39;wav </span><span class="si">{}</span><span class="s1"> 0 0 0&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">))</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">fast_voltage_set</span><span class="p">():</span>
+               <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s1">&#39;wav </span><span class="si">{}</span><span class="s1"> 0 0 0&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">))</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s1">&#39;set </span><span class="si">{}</span><span class="s1"> </span><span class="si">{:.6f}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="n">v_set</span><span class="p">))</span>
 
     <span class="k">def</span> <span class="nf">_set_vrange</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">chan</span><span class="p">,</span> <span class="n">switchint</span><span class="p">):</span>

_modules/qcodes/instrument_drivers/stanford_research/SR830.html

@@ -273,7 +273,8 @@ <h1>Source code for qcodes.instrument_drivers.stanford_research.SR830</h1><div c
         <span class="c1"># parse it</span>
         <span class="n">realdata</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">fromstring</span><span class="p">(</span><span class="n">rawdata</span><span class="p">,</span> <span class="n">dtype</span><span class="o">=</span><span class="s1">&#39;&lt;i2&#39;</span><span class="p">)</span>
         <span class="n">numbers</span> <span class="o">=</span> <span class="n">realdata</span><span class="p">[::</span><span class="mi">2</span><span class="p">]</span><span class="o">*</span><span class="mf">2.0</span><span class="o">**</span><span class="p">(</span><span class="n">realdata</span><span class="p">[</span><span class="mi">1</span><span class="p">::</span><span class="mi">2</span><span class="p">]</span><span class="o">-</span><span class="mi">124</span><span class="p">)</span>
-
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">!=</span> <span class="n">N</span><span class="p">:</span>
+            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="s2">&quot;SR830 got </span><span class="si">{}</span><span class="s2"> points in buffer expected </span><span class="si">{}</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">N</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">0</span><span class="p">]))</span>
         <span class="k">return</span> <span class="n">numbers</span></div></div>
 
 

api/generated/qcodes.instrument_drivers.QDev.html

@@ -280,7 +280,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.QDev.QDac.QDac.voltage_range_status">
-<code class="descname">voltage_range_status</code><em class="property"> = {'X 1': 10, 'X 0.1': 1}</em><a class="headerlink" href="#qcodes.instrument_drivers.QDev.QDac.QDac.voltage_range_status" title="Permalink to this definition">¶</a></dt>
+<code class="descname">voltage_range_status</code><em class="property"> = {'X 0.1': 1, 'X 1': 10}</em><a class="headerlink" href="#qcodes.instrument_drivers.QDev.QDac.QDac.voltage_range_status" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
@@ -383,7 +383,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.QDev.QDac_channels.QDac.voltage_range_status">
-<code class="descname">voltage_range_status</code><em class="property"> = {'X 1': 10, 'X 0.1': 1}</em><a class="headerlink" href="#qcodes.instrument_drivers.QDev.QDac_channels.QDac.voltage_range_status" title="Permalink to this definition">¶</a></dt>
+<code class="descname">voltage_range_status</code><em class="property"> = {'X 0.1': 1, 'X 1': 10}</em><a class="headerlink" href="#qcodes.instrument_drivers.QDev.QDac_channels.QDac.voltage_range_status" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">

api/generated/qcodes.instrument_drivers.signal_hound.html

@@ -319,12 +319,12 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus">
-<code class="descname">saStatus</code><em class="property"> = {'saNotConfiguredErr': -6, 'saBandwidthClamped': 4, 'saExternalReferenceNotFound': -89, 'saUnknownErr': -666, 'saNoError': 0, 'saCompressionWarning': 2, 'saInvalidModeErr': -7, 'saInvalidScaleErr': -94, 'saParameterClamped': 3, 'saNoCorrections': 1, 'saOvenColdErr': -20, 'saTrackingGeneratorNotFound': -10, 'saDeviceNotIdleErr': -9, 'saTooManyDevicesErr': -5, 'saInvalidDetectorErr': -95, 'saInvalidParameterErr': -4, 'saInvalidDeviceErr': -2, 'saDeviceNotConfiguredErr': -6, 'saInternetErr': -12, 'saUSBCommErr': -11, 'saDeviceNotOpenErr': -3, 'saBandwidthErr': -91, 'saNullPtrErr': -1, 'saFrequencyRangeErr': -99, 'saDeviceNotFoundErr': -8}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus" title="Permalink to this definition">¶</a></dt>
+<code class="descname">saStatus</code><em class="property"> = {'saExternalReferenceNotFound': -89, 'saInvalidModeErr': -7, 'saDeviceNotFoundErr': -8, 'saInternetErr': -12, 'saParameterClamped': 3, 'saUnknownErr': -666, 'saDeviceNotIdleErr': -9, 'saBandwidthClamped': 4, 'saNoError': 0, 'saCompressionWarning': 2, 'saTrackingGeneratorNotFound': -10, 'saInvalidDeviceErr': -2, 'saInvalidDetectorErr': -95, 'saInvalidParameterErr': -4, 'saNoCorrections': 1, 'saBandwidthErr': -91, 'saTooManyDevicesErr': -5, 'saOvenColdErr': -20, 'saDeviceNotConfiguredErr': -6, 'saDeviceNotOpenErr': -3, 'saNullPtrErr': -1, 'saUSBCommErr': -11, 'saNotConfiguredErr': -6, 'saInvalidScaleErr': -94, 'saFrequencyRangeErr': -99}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus_inverted">
-<code class="descname">saStatus_inverted</code><em class="property"> = {0: 'saNoError', 1: 'saNoCorrections', 2: 'saCompressionWarning', 3: 'saParameterClamped', 4: 'saBandwidthClamped', -1: 'saNullPtrErr', -99: 'saFrequencyRangeErr', -95: 'saInvalidDetectorErr', -94: 'saInvalidScaleErr', -91: 'saBandwidthErr', -666: 'saUnknownErr', -89: 'saExternalReferenceNotFound', -20: 'saOvenColdErr', -12: 'saInternetErr', -11: 'saUSBCommErr', -10: 'saTrackingGeneratorNotFound', -9: 'saDeviceNotIdleErr', -8: 'saDeviceNotFoundErr', -7: 'saInvalidModeErr', -6: 'saDeviceNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -2: 'saInvalidDeviceErr'}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus_inverted" title="Permalink to this definition">¶</a></dt>
+<code class="descname">saStatus_inverted</code><em class="property"> = {0: 'saNoError', 1: 'saNoCorrections', 2: 'saCompressionWarning', 3: 'saParameterClamped', 4: 'saBandwidthClamped', -99: 'saFrequencyRangeErr', -95: 'saInvalidDetectorErr', -94: 'saInvalidScaleErr', -91: 'saBandwidthErr', -666: 'saUnknownErr', -89: 'saExternalReferenceNotFound', -20: 'saOvenColdErr', -12: 'saInternetErr', -2: 'saInvalidDeviceErr', -10: 'saTrackingGeneratorNotFound', -9: 'saDeviceNotIdleErr', -8: 'saDeviceNotFoundErr', -7: 'saInvalidModeErr', -6: 'saNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -1: 'saNullPtrErr', -11: 'saUSBCommErr'}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus_inverted" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">