Generated gh-pages for commit 9a007d1

Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Mercury when aborting a ramp switch the magnet to hold (#792)

_modules/qcodes/instrument_drivers/oxford/mercuryiPS.html

@@ -372,8 +372,12 @@ <h1>Source code for qcodes.instrument_drivers.oxford.mercuryiPS</h1><div class="
         <span class="bp">self</span><span class="o">.</span><span class="n">_set_fld</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="n">cmd</span><span class="p">,</span> <span class="n">setpoint</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">rtos</span><span class="p">()</span>
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">hold_after_set</span><span class="p">():</span>
-            <span class="k">while</span> <span class="ow">not</span> <span class="nb">all</span><span class="p">([</span><span class="s1">&#39;HOLD&#39;</span> <span class="o">==</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="o">+</span> <span class="s1">&#39;_ACTN&#39;</span><span class="p">)()</span> <span class="k">for</span> <span class="n">a</span> <span class="ow">in</span> <span class="n">ax</span><span class="p">]):</span>
-                <span class="n">time</span><span class="o">.</span><span class="n">sleep</span><span class="p">(</span><span class="mf">0.1</span><span class="p">)</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="k">while</span> <span class="ow">not</span> <span class="nb">all</span><span class="p">([</span><span class="s1">&#39;HOLD&#39;</span> <span class="o">==</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="o">+</span> <span class="s1">&#39;_ACTN&#39;</span><span class="p">)()</span> <span class="k">for</span> <span class="n">a</span> <span class="ow">in</span> <span class="n">ax</span><span class="p">]):</span>
+                    <span class="n">time</span><span class="o">.</span><span class="n">sleep</span><span class="p">(</span><span class="mf">0.1</span><span class="p">)</span>
+            <span class="k">except</span> <span class="ne">KeyboardInterrupt</span><span class="p">:</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">hold</span><span class="p">()</span>
+                <span class="k">raise</span> <span class="ne">KeyboardInterrupt</span>
 
     <span class="k">def</span> <span class="nf">_ramp_to_setpoint_and_wait</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">ax</span><span class="p">,</span> <span class="n">cmd</span><span class="p">,</span> <span class="n">setpoint</span><span class="p">):</span>
         <span class="n">error</span> <span class="o">=</span> <span class="mf">0.2e-3</span>

api/generated/qcodes.instrument_drivers.QDev.html

@@ -279,7 +279,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">
@@ -382,7 +382,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.ithaco.html

@@ -224,7 +224,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>measured_param</strong> (<a class="reference internal" href="qcodes.Parameter.html#qcodes.Parameter" title="qcodes.Parameter"><em>Parameter</em></a>) – a gettable parameter returning the
 voltage read from the Ithaco output.</li>
-<li><strong>c_amp_ins</strong> (<a class="reference internal" href="#qcodes.instrument_drivers.ithaco.Ithaco_1211.Ithaco_1211" title="qcodes.instrument_drivers.ithaco.Ithaco_1211.Ithaco_1211"><em>Ithaco_1211</em></a>) – <p>an Ithaco instance where you manually
+<li><strong>c_amp_ins</strong> (<a class="reference internal" href="#module-qcodes.instrument_drivers.ithaco.Ithaco_1211" title="qcodes.instrument_drivers.ithaco.Ithaco_1211"><em>Ithaco_1211</em></a>) – <p>an Ithaco instance where you manually
 maintain the present settings of the real Ithaco amp.</p>
 <p>Note: it should be possible to use other current preamps, if they
 define parameters <code class="docutils literal"><span class="pre">sens</span></code> (sensitivity, in A/V), <code class="docutils literal"><span class="pre">sens_factor</span></code>

api/generated/qcodes.instrument_drivers.signal_hound.html

@@ -318,12 +318,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"> = {'saDeviceNotOpenErr': -3, 'saInvalidDetectorErr': -95, 'saUSBCommErr': -11, 'saBandwidthClamped': 4, 'saNullPtrErr': -1, 'saNoCorrections': 1, 'saCompressionWarning': 2, 'saInvalidDeviceErr': -2, 'saTooManyDevicesErr': -5, 'saFrequencyRangeErr': -99, 'saInvalidModeErr': -7, 'saNoError': 0, 'saBandwidthErr': -91, 'saInvalidScaleErr': -94, 'saExternalReferenceNotFound': -89, 'saDeviceNotFoundErr': -8, 'saDeviceNotConfiguredErr': -6, 'saUnknownErr': -666, 'saInvalidParameterErr': -4, 'saTrackingGeneratorNotFound': -10, 'saOvenColdErr': -20, 'saInternetErr': -12, 'saNotConfiguredErr': -6, 'saParameterClamped': 3, 'saDeviceNotIdleErr': -9}</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"> = {'saOvenColdErr': -20, 'saExternalReferenceNotFound': -89, 'saDeviceNotIdleErr': -9, 'saTrackingGeneratorNotFound': -10, 'saUSBCommErr': -11, 'saUnknownErr': -666, 'saInternetErr': -12, 'saNullPtrErr': -1, 'saInvalidScaleErr': -94, 'saDeviceNotOpenErr': -3, 'saTooManyDevicesErr': -5, 'saInvalidModeErr': -7, 'saFrequencyRangeErr': -99, 'saBandwidthErr': -91, 'saInvalidDeviceErr': -2, 'saInvalidParameterErr': -4, 'saBandwidthClamped': 4, 'saDeviceNotConfiguredErr': -6, 'saDeviceNotFoundErr': -8, 'saNotConfiguredErr': -6, 'saParameterClamped': 3, 'saNoError': 0, 'saInvalidDetectorErr': -95, 'saCompressionWarning': 2, 'saNoCorrections': 1}</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', -2: 'saInvalidDeviceErr', -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: 'saNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -1: 'saNullPtrErr'}</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', -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: 'saNotConfiguredErr', -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>
 <dd></dd></dl>
 
 <dl class="method">

api/generated/qcodes.instrument_drivers.stanford_research.html

@@ -550,7 +550,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>name</strong> (<a class="reference external" href="https://docs.python.org/3.5/library/stdtypes.html#str" title="(in Python v3.5)"><em>str</em></a>) – The name of the parameter</li>
-<li><strong>instrument</strong> (<a class="reference internal" href="#qcodes.instrument_drivers.stanford_research.SR830.SR830" title="qcodes.instrument_drivers.stanford_research.SR830.SR830"><em>SR830</em></a>) – The parent instrument</li>
+<li><strong>instrument</strong> (<a class="reference internal" href="#module-qcodes.instrument_drivers.stanford_research.SR830" title="qcodes.instrument_drivers.stanford_research.SR830"><em>SR830</em></a>) – The parent instrument</li>
 <li><strong>channel</strong> (<a class="reference external" href="https://docs.python.org/3.5/library/functions.html#int" title="(in Python v3.5)"><em>int</em></a>) – The relevant channel (1 or 2). The name should
 should match this.</li>
 </ul>

api/generated/qcodes.instrument_drivers.tektronix.html

@@ -269,12 +269,12 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 </table>
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL">
-<code class="descname">AWG_FILE_FORMAT_CHANNEL</code><em class="property"> = {'MARKER1_METHOD_N': 'h', 'MARKER1_HIGH_N': 'd', 'DIGITAL_HIGH_N': 'd', 'ANALOG_FILTER_N': 'h', 'DELAY_IN_TIME_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'DIGITAL_LOW_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'ANALOG_HIGH_N': 'd', 'ANALOG_LOW_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER2_SKEW_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'MARKER2_METHOD_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'PHASE_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'DIGITAL_METHOD_N': 'h', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'ANALOG_AMPLITUDE_N': 'd', 'MARKER2_LOW_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_HIGH_N': 'd', 'CHANNEL_STATE_N': 'h', 'EXTERNAL_ADD_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'ANALOG_OFFSET_N': 'd', 'CHANNEL_SKEW_N': 'd', 'MARKER1_OFFSET_N': 'd', 'MARKER2_OFFSET_N': 'd', 'MARKER1_SKEW_N': 'd'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL" title="Permalink to this definition">¶</a></dt>
+<code class="descname">AWG_FILE_FORMAT_CHANNEL</code><em class="property"> = {'CHANNEL_SKEW_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'CHANNEL_STATE_N': 'h', 'DIGITAL_HIGH_N': 'd', 'MARKER1_HIGH_N': 'd', 'PHASE_N': 'd', 'MARKER2_OFFSET_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_METHOD_N': 'h', 'ANALOG_HIGH_N': 'd', 'DELAY_IN_TIME_N': 'd', 'ANALOG_LOW_N': 'd', 'DIGITAL_METHOD_N': 'h', 'MARKER1_AMPLITUDE_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'EXTERNAL_ADD_N': 'h', 'MARKER2_SKEW_N': 'd', 'MARKER1_SKEW_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'ANALOG_OFFSET_N': 'd', 'MARKER2_HIGH_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER2_LOW_N': 'd', 'ANALOG_FILTER_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'MARKER1_OFFSET_N': 'd', 'MARKER2_METHOD_N': 'h', 'MARKER1_METHOD_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'DIGITAL_LOW_N': 'd'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD">
-<code class="descname">AWG_FILE_FORMAT_HEAD</code><em class="property"> = {'CLOCK_SOURCE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'TRIGGER_INPUT_THRESHOLD': 'd', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'REPETITION_RATE': 'd', 'HOLD_REPETITION_RATE': 'h', 'TRIGGER_SOURCE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'SAMPLING_RATE': 'd', 'COUPLING': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'JUMP_TIMING': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'REFERENCE_SOURCE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'RUN_MODE': 'h', 'WAIT_VALUE': 'h', 'DIVIDER_RATE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'INTERLEAVE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'RUN_STATE': 'h', 'ZEROING': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD" title="Permalink to this definition">¶</a></dt>
+<code class="descname">AWG_FILE_FORMAT_HEAD</code><em class="property"> = {'INTERLEAVE': 'h', 'REPETITION_RATE': 'd', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'CLOCK_SOURCE': 'h', 'TRIGGER_SOURCE': 'h', 'COUPLING': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'RUN_MODE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'JUMP_TIMING': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'SAMPLING_RATE': 'd', 'INTERNAL_TRIGGER_RATE': 'd', 'EXTERNAL_REFERENCE_TYPE': 'h', 'ZEROING': 'h', 'DIVIDER_RATE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'HOLD_REPETITION_RATE': 'h', 'RUN_STATE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'REFERENCE_SOURCE': 'h', 'WAIT_VALUE': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">