Skip to content

Commit

Permalink
Generated gh-pages for commit dce438b
Browse files Browse the repository at this point in the history
Author: Jens Hedegaard Nielsen <[email protected]>

    Fix: add a phase parameter to keysight 33500b (#551)
  • Loading branch information
Documentation Bot committed Mar 30, 2017
1 parent d5a8605 commit d80fb9b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,14 @@ <h1>Source code for qcodes.instrument_drivers.Keysight.Keysight_33500B</h1><div
<span class="n">vals</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="mf">1e-6</span><span class="p">,</span> <span class="mf">30e6</span><span class="p">)</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="s1">&#39;ch</span><span class="si">{}</span><span class="s1">_phase&#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">label</span><span class="o">=</span><span class="s1">&#39;Channel </span><span class="si">{}</span><span class="s1"> phase&#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">set_cmd</span><span class="o">=</span><span class="n">setcmd</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="s1">&#39;PHASe&#39;</span><span class="p">),</span>
<span class="n">get_cmd</span><span class="o">=</span><span class="n">getcmd</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="s1">&#39;PHASe&#39;</span><span class="p">),</span>
<span class="n">get_parser</span><span class="o">=</span><span class="nb">float</span><span class="p">,</span>
<span class="n">unit</span><span class="o">=</span><span class="s1">&#39;deg&#39;</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">Numbers</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">360</span><span class="p">)</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="s1">&#39;ch</span><span class="si">{}</span><span class="s1">_amplitude_unit&#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">label</span><span class="o">=</span><span class="s1">&#39;Channel </span><span class="si">{}</span><span class="s1"> amplitude unit&#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">set_cmd</span><span class="o">=</span><span class="n">setcmd</span><span class="p">(</span><span class="n">chan</span><span class="p">,</span> <span class="s1">&#39;VOLTage:UNIT&#39;</span><span class="p">),</span>
Expand Down
2 changes: 1 addition & 1 deletion api/generated/qcodes.instrument_drivers.QDev.html
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,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 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>
<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>
<dd></dd></dl>

<dl class="method">
Expand Down
2 changes: 1 addition & 1 deletion api/generated/qcodes.instrument_drivers.ithaco.html
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,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>) &#8211; a gettable parameter returning the
voltage read from the Ithaco output.</li>
<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>) &#8211; <p>an Ithaco instance where you manually
<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>) &#8211; <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>
Expand Down
2 changes: 1 addition & 1 deletion api/generated/qcodes.instrument_drivers.signal_hound.html
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ <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"> = {'saInvalidParameterErr': -4, 'saInvalidDetectorErr': -95, 'saBandwidthErr': -91, 'saNoError': 0, 'saFrequencyRangeErr': -99, 'saInvalidScaleErr': -94, 'saDeviceNotFoundErr': -8, 'saDeviceNotOpenErr': -3, 'saNotConfiguredErr': -6, 'saUnknownErr': -666, 'saOvenColdErr': -20, 'saNoCorrections': 1, 'saDeviceNotIdleErr': -9, 'saTrackingGeneratorNotFound': -10, 'saTooManyDevicesErr': -5, 'saBandwidthClamped': 4, 'saExternalReferenceNotFound': -89, 'saInvalidModeErr': -7, 'saUSBCommErr': -11, 'saInvalidDeviceErr': -2, 'saCompressionWarning': 2, 'saInternetErr': -12, 'saParameterClamped': 3, 'saNullPtrErr': -1, 'saDeviceNotConfiguredErr': -6}</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"> = {'saNoCorrections': 1, 'saInvalidParameterErr': -4, 'saBandwidthErr': -91, 'saNotConfiguredErr': -6, 'saFrequencyRangeErr': -99, 'saUnknownErr': -666, 'saNullPtrErr': -1, 'saParameterClamped': 3, 'saInvalidScaleErr': -94, 'saCompressionWarning': 2, 'saInvalidDetectorErr': -95, 'saOvenColdErr': -20, 'saUSBCommErr': -11, 'saDeviceNotFoundErr': -8, 'saInternetErr': -12, 'saBandwidthClamped': 4, 'saInvalidDeviceErr': -2, 'saNoError': 0, 'saTrackingGeneratorNotFound': -10, 'saDeviceNotOpenErr': -3, 'saDeviceNotConfiguredErr': -6, 'saInvalidModeErr': -7, 'saDeviceNotIdleErr': -9, 'saTooManyDevicesErr': -5, 'saExternalReferenceNotFound': -89}</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">
Expand Down
4 changes: 2 additions & 2 deletions api/generated/qcodes.instrument_drivers.tektronix.html
Original file line number Diff line number Diff line change
Expand Up @@ -260,12 +260,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"> = {'MARKER2_SKEW_N': 'd', 'EXTERNAL_ADD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_METHOD_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'ANALOG_METHOD_N': 'h', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER1_AMPLITUDE_N': 'd', 'DIGITAL_METHOD_N': 'h', 'MARKER1_METHOD_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'MARKER2_HIGH_N': 'd', 'DIGITAL_HIGH_N': 'd', 'CHANNEL_SKEW_N': 'd', 'MARKER1_SKEW_N': 'd', 'PHASE_N': 'd', 'MARKER1_OFFSET_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'DELAY_IN_TIME_N': 'd', 'ANALOG_HIGH_N': 'd', 'MARKER2_LOW_N': 'd', 'MARKER1_HIGH_N': 'd', 'ANALOG_FILTER_N': 'h', 'MARKER2_OFFSET_N': 'd', 'DIGITAL_LOW_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_OFFSET_N': 'd', 'ANALOG_LOW_N': 'd', 'CHANNEL_STATE_N': 'h', 'DELAY_IN_POINTS_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"> = {'DIGITAL_METHOD_N': 'h', 'MARKER1_AMPLITUDE_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER2_HIGH_N': 'd', 'DIGITAL_HIGH_N': 'd', 'PHASE_N': 'd', 'MARKER1_OFFSET_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'DELAY_IN_TIME_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_FILTER_N': 'h', 'CHANNEL_STATE_N': 'h', 'OUTPUT_WAVEFORM_NAME_N': 's', 'EXTERNAL_ADD_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'ANALOG_OFFSET_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'MARKER1_HIGH_N': 'd', 'ANALOG_LOW_N': 'd', 'MARKER1_SKEW_N': 'd', 'MARKER1_METHOD_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER2_SKEW_N': 'd', 'DIGITAL_LOW_N': 'd', 'ANALOG_HIGH_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_OFFSET_N': 'd', 'MARKER2_LOW_N': 'd', 'CHANNEL_SKEW_N': 'd', 'MARKER2_METHOD_N': 'h'}</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"> = {'RUN_STATE': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'HOLD_REPETITION_RATE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'SAMPLING_RATE': 'd', 'WAIT_VALUE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'ZEROING': 'h', 'REPETITION_RATE': 'd', 'RUN_MODE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'COUPLING': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'EVENT_INPUT_POLARITY': 'h', 'JUMP_TIMING': 'h', 'INTERLEAVE': 'h', 'CLOCK_SOURCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'EVENT_INPUT_THRESHOLD': 'd', 'TRIGGER_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'TRIGGER_SOURCE': 'h', 'DIVIDER_RATE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'REFERENCE_SOURCE': '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"> = {'EVENT_INPUT_IMPEDANCE': 'h', 'RUN_MODE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'ZEROING': 'h', 'DIVIDER_RATE': 'h', 'SAMPLING_RATE': 'd', 'TRIGGER_SOURCE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'WAIT_VALUE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'COUPLING': 'h', 'JUMP_TIMING': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'INTERNAL_TRIGGER_RATE': 'd', 'TRIGGER_INPUT_POLARITY': 'h', 'REFERENCE_SOURCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'RUN_STATE': 'h', 'INTERLEAVE': 'h', 'HOLD_REPETITION_RATE': 'h', 'CLOCK_SOURCE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'REPETITION_RATE': 'd', 'EXTERNAL_REFERENCE_TYPE': '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">
Expand Down

0 comments on commit d80fb9b

Please sign in to comment.