diff --git a/_modules/qcodes/instrument_drivers/QDev/QDac.html b/_modules/qcodes/instrument_drivers/QDev/QDac.html index 4f119086a3c..ab3e83a749f 100644 --- a/_modules/qcodes/instrument_drivers/QDev/QDac.html +++ b/_modules/qcodes/instrument_drivers/QDev/QDac.html @@ -321,6 +321,14 @@

Source code for qcodes.instrument_drivers.QDev.QDac

set_cmd='ver {}', val_mapping={True: 1, False: 0}) + self.add_parameter(name='fast_voltage_set', + label='fast voltage set', + parameter_class=ManualParameter, + vals=vals.Bool(), + initial_value=False, + docstring=""""Toggles if DC voltage set should unset any ramp attached to this channel. + If you enable this you should ensure thay any function generator is unset + from the channel before setting voltage""") # Initialise the instrument, all channels DC (unbind func. generators) for chan in self.chan_range: # Note: this call does NOT change the voltage on the channel @@ -373,17 +381,18 @@

Source code for qcodes.instrument_drivers.QDev.QDac

self._assigned_fgs[chan] = fg # We need .get and not get_latest in case a ramp was interrupted v_start = self.parameters['ch{:02}_v'.format(chan)].get() - time = abs(v_set-v_start)/slope - log.info('Slope: {}, time: {}'.format(slope, time)) + mytime = abs(v_set-v_start)/slope + log.info('Slope: {}, time: {}'.format(slope, mytime)) # Attenuation compensation and syncing # happen inside _rampvoltage - self._rampvoltage(chan, fg, v_start, v_set, time) + self._rampvoltage(chan, fg, v_start, v_set, mytime) else: # compensate for the 0.1 multiplier, if it's on if self.parameters['ch{:02}_vrange'.format(chan)].get_latest() == 1: v_set = v_set*10 # set the mode back to DC in case it had been changed - self.write('wav {} 0 0 0'.format(chan)) + if not self.fast_voltage_set(): + self.write('wav {} 0 0 0'.format(chan)) self.write('set {} {:.6f}'.format(chan, v_set)) def _set_vrange(self, chan, switchint): diff --git a/_modules/qcodes/instrument_drivers/QDev/QDac_channels.html b/_modules/qcodes/instrument_drivers/QDev/QDac_channels.html index 0c7e8ad89bb..9a8a7eb8e28 100644 --- a/_modules/qcodes/instrument_drivers/QDev/QDac_channels.html +++ b/_modules/qcodes/instrument_drivers/QDev/QDac_channels.html @@ -409,6 +409,14 @@

Source code for qcodes.instrument_drivers.QDev.QDac_channels

set_cmd='ver {}', val_mapping={True: 1, False: 0}) + self.add_parameter(name='fast_voltage_set', + label='fast voltage set', + parameter_class=ManualParameter, + vals=vals.Bool(), + initial_value=False, + docstring=""""Toggles if DC voltage set should unset any ramp attached to this channel. + If you enable this you should ensure that any function generator is unset + from the channel before setting voltage""") # Initialise the instrument, all channels DC (unbind func. generators) for chan in self.chan_range: # Note: this call does NOT change the voltage on the channel @@ -479,7 +487,8 @@

Source code for qcodes.instrument_drivers.QDev.QDac_channels

if self.channels[chan-1].vrange.get_latest() == 1: v_set = v_set*10 # set the mode back to DC in case it had been changed - self.write('wav {} 0 0 0'.format(chan)) + if not self.fast_voltage_set(): + self.write('wav {} 0 0 0'.format(chan)) self.write('set {} {:.6f}'.format(chan, v_set)) def _set_vrange(self, chan, switchint): diff --git a/_modules/qcodes/instrument_drivers/stanford_research/SR830.html b/_modules/qcodes/instrument_drivers/stanford_research/SR830.html index d3df75c1af9..0cb0be2f61d 100644 --- a/_modules/qcodes/instrument_drivers/stanford_research/SR830.html +++ b/_modules/qcodes/instrument_drivers/stanford_research/SR830.html @@ -273,7 +273,8 @@

Source code for qcodes.instrument_drivers.stanford_research.SR830

# parse it realdata = np.fromstring(rawdata, dtype='<i2') numbers = realdata[::2]*2.0**(realdata[1::2]-124) - + if self.shape[0] != N: + raise RuntimeError("SR830 got {} points in buffer expected {}".format(N, self.shape[0])) return numbers
diff --git a/api/generated/qcodes.instrument_drivers.QDev.html b/api/generated/qcodes.instrument_drivers.QDev.html index 6bf00bde87a..03cf5379429 100644 --- a/api/generated/qcodes.instrument_drivers.QDev.html +++ b/api/generated/qcodes.instrument_drivers.QDev.html @@ -280,7 +280,7 @@

Submodules
-voltage_range_status = {'X 1': 10, 'X 0.1': 1}
+voltage_range_status = {'X 0.1': 1, 'X 1': 10}
@@ -383,7 +383,7 @@

Submodules
-voltage_range_status = {'X 1': 10, 'X 0.1': 1}
+voltage_range_status = {'X 0.1': 1, 'X 1': 10}

diff --git a/api/generated/qcodes.instrument_drivers.signal_hound.html b/api/generated/qcodes.instrument_drivers.signal_hound.html index 6f8062a894c..c2f9b244357 100644 --- a/api/generated/qcodes.instrument_drivers.signal_hound.html +++ b/api/generated/qcodes.instrument_drivers.signal_hound.html @@ -319,12 +319,12 @@

Submodules
-saStatus = {'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}
+saStatus = {'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}

-saStatus_inverted = {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'}
+saStatus_inverted = {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'}
diff --git a/api/generated/qcodes.instrument_drivers.tektronix.html b/api/generated/qcodes.instrument_drivers.tektronix.html index 4858a7d8e7d..3af5d1e9947 100644 --- a/api/generated/qcodes.instrument_drivers.tektronix.html +++ b/api/generated/qcodes.instrument_drivers.tektronix.html @@ -269,12 +269,12 @@

Submodules
-AWG_FILE_FORMAT_CHANNEL = {'MARKER1_SKEW_N': 'd', 'ANALOG_FILTER_N': 'h', 'MARKER1_LOW_N': 'd', 'DIGITAL_HIGH_N': 'd', 'MARKER1_OFFSET_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER1_HIGH_N': 'd', 'MARKER1_METHOD_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'ANALOG_LOW_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'MARKER2_HIGH_N': 'd', 'CHANNEL_SKEW_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER1_AMPLITUDE_N': 'd', 'EXTERNAL_ADD_N': 'h', 'ANALOG_HIGH_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'DIGITAL_METHOD_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'MARKER2_SKEW_N': 'd', 'MARKER2_METHOD_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'CHANNEL_STATE_N': 'h', 'ANALOG_OFFSET_N': 'd', 'PHASE_N': 'd', 'MARKER2_OFFSET_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'DIGITAL_LOW_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_LOW_N': 'd', 'DELAY_IN_TIME_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's'}
+AWG_FILE_FORMAT_CHANNEL = {'MARKER1_OFFSET_N': 'd', 'DIGITAL_LOW_N': 'd', 'DELAY_IN_TIME_N': 'd', 'MARKER2_METHOD_N': 'h', 'EXTERNAL_ADD_N': 'h', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'ANALOG_LOW_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'ANALOG_OFFSET_N': 'd', 'CHANNEL_SKEW_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'MARKER1_LOW_N': 'd', 'DIGITAL_HIGH_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'ANALOG_METHOD_N': 'h', 'MARKER1_METHOD_N': 'h', 'DELAY_IN_POINTS_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'PHASE_N': 'd', 'MARKER2_LOW_N': 'd', 'ANALOG_FILTER_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'MARKER2_HIGH_N': 'd', 'ANALOG_HIGH_N': 'd', 'DIGITAL_METHOD_N': 'h', 'MARKER1_HIGH_N': 'd', 'CHANNEL_STATE_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER1_SKEW_N': 'd', 'MARKER2_SKEW_N': 'd', 'MARKER2_OFFSET_N': 'd'}

-AWG_FILE_FORMAT_HEAD = {'TRIGGER_INPUT_POLARITY': 'h', 'EVENT_INPUT_POLARITY': 'h', 'TRIGGER_SOURCE': 'h', 'DIVIDER_RATE': 'h', 'RUN_STATE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'REPETITION_RATE': 'd', 'INTERLEAVE': 'h', 'RUN_MODE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'HOLD_REPETITION_RATE': 'h', 'JUMP_TIMING': 'h', 'SAMPLING_RATE': 'd', 'COUPLING': 'h', 'CLOCK_SOURCE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'ZEROING': 'h', 'WAIT_VALUE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'EXTERNAL_REFERENCE_TYPE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'INTERLEAVE_ADJ_PHASE': 'd', 'TRIGGER_INPUT_THRESHOLD': 'd', 'REFERENCE_SOURCE': 'h'}
+AWG_FILE_FORMAT_HEAD = {'EVENT_INPUT_IMPEDANCE': 'h', 'REFERENCE_SOURCE': 'h', 'DIVIDER_RATE': 'h', 'WAIT_VALUE': 'h', 'RUN_STATE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'HOLD_REPETITION_RATE': 'h', 'COUPLING': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'TRIGGER_SOURCE': 'h', 'ZEROING': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'REFERENCE_MULTIPLIER_RATE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'JUMP_TIMING': 'h', 'RUN_MODE': 'h', 'INTERLEAVE': 'h', 'CLOCK_SOURCE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'INTERNAL_TRIGGER_RATE': 'd', 'EVENT_INPUT_POLARITY': 'h', 'REPETITION_RATE': 'd', 'INTERLEAVE_ADJ_PHASE': 'd', 'EXTERNAL_REFERENCE_TYPE': 'h', 'SAMPLING_RATE': 'd'}
diff --git a/py-modindex.html b/py-modindex.html index 93de30076b9..91aa7e86824 100644 --- a/py-modindex.html +++ b/py-modindex.html @@ -297,12 +297,12 @@

Python Module Index

    - qcodes.instrument_drivers.keysight + qcodes.instrument_drivers.Keysight     - qcodes.instrument_drivers.Keysight + qcodes.instrument_drivers.keysight