setarr = getattr(self.traces[i]['config'][axis], 'ndarray', None)
arrmin = None
arrmax = None
- if setarr and not np.all(np.isnan(setarr)):
+ if setarr is not None and not np.all(np.isnan(setarr)):
arrmax = setarr.max()
arrmin = setarr.min()
elif startranges is not None:
diff --git a/api/generated/qcodes.instrument_drivers.signal_hound.html b/api/generated/qcodes.instrument_drivers.signal_hound.html
index 56701c1c63e..dfc855b7c79 100644
--- a/api/generated/qcodes.instrument_drivers.signal_hound.html
+++ b/api/generated/qcodes.instrument_drivers.signal_hound.html
@@ -318,12 +318,12 @@ Submodules
-saStatus = {'saTrackingGeneratorNotFound': -10, 'saBandwidthClamped': 4, 'saFrequencyRangeErr': -99, 'saDeviceNotConfiguredErr': -6, 'saBandwidthErr': -91, 'saNotConfiguredErr': -6, 'saNullPtrErr': -1, 'saUSBCommErr': -11, 'saDeviceNotOpenErr': -3, 'saNoError': 0, 'saExternalReferenceNotFound': -89, 'saInvalidParameterErr': -4, 'saOvenColdErr': -20, 'saNoCorrections': 1, 'saInvalidDeviceErr': -2, 'saInvalidDetectorErr': -95, 'saDeviceNotFoundErr': -8, 'saTooManyDevicesErr': -5, 'saInvalidModeErr': -7, 'saDeviceNotIdleErr': -9, 'saUnknownErr': -666, 'saParameterClamped': 3, 'saCompressionWarning': 2, 'saInvalidScaleErr': -94, 'saInternetErr': -12}¶
+saStatus = {'saTrackingGeneratorNotFound': -10, 'saInvalidModeErr': -7, 'saTooManyDevicesErr': -5, 'saBandwidthErr': -91, 'saCompressionWarning': 2, 'saUSBCommErr': -11, 'saExternalReferenceNotFound': -89, 'saInternetErr': -12, 'saInvalidDeviceErr': -2, 'saFrequencyRangeErr': -99, 'saNotConfiguredErr': -6, 'saOvenColdErr': -20, 'saUnknownErr': -666, 'saNoCorrections': 1, 'saDeviceNotFoundErr': -8, 'saInvalidScaleErr': -94, 'saBandwidthClamped': 4, 'saInvalidDetectorErr': -95, 'saInvalidParameterErr': -4, 'saDeviceNotConfiguredErr': -6, 'saParameterClamped': 3, 'saDeviceNotOpenErr': -3, 'saNoError': 0, 'saDeviceNotIdleErr': -9, 'saNullPtrErr': -1}¶
-
-
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: 'saNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -2: 'saInvalidDeviceErr'}¶
+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'}¶
diff --git a/api/generated/qcodes.instrument_drivers.stanford_research.html b/api/generated/qcodes.instrument_drivers.stanford_research.html
index c42a3bae9cb..770980ab43f 100644
--- a/api/generated/qcodes.instrument_drivers.stanford_research.html
+++ b/api/generated/qcodes.instrument_drivers.stanford_research.html
@@ -513,7 +513,7 @@ SubmodulesParameters:
- measured_param (Parameter) – a gettable parameter returning the
voltage read from the SR560 output.
-- v_amp_ins (SR560) –
an SR560 instance where you manually
+
- v_amp_ins (SR560) –
an SR560 instance where you manually
maintain the present settings of the real SR560 amp.
Note: it should be possible to use other voltage preamps, if they
define parameters gain (V_out / V_in) and invert
diff --git a/api/generated/qcodes.instrument_drivers.tektronix.html b/api/generated/qcodes.instrument_drivers.tektronix.html
index ce5d7350b43..6a0b867f59d 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_AMPLITUDE_N': 'd', 'DIGITAL_METHOD_N': 'h', 'MARKER2_HIGH_N': 'd', 'MARKER1_LOW_N': 'd', 'DIGITAL_HIGH_N': 'd', 'MARKER2_LOW_N': 'd', 'DIGITAL_LOW_N': 'd', 'MARKER1_HIGH_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER2_METHOD_N': 'h', 'MARKER1_SKEW_N': 'd', 'ANALOG_LOW_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'PHASE_N': 'd', 'EXTERNAL_ADD_N': 'h', 'MARKER2_OFFSET_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'DELAY_IN_TIME_N': 'd', 'ANALOG_OFFSET_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER2_SKEW_N': 'd', 'MARKER1_METHOD_N': 'h', 'ANALOG_HIGH_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'CHANNEL_SKEW_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'ANALOG_FILTER_N': 'h', 'MARKER1_OFFSET_N': 'd', 'CHANNEL_STATE_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd'}¶
+AWG_FILE_FORMAT_CHANNEL = {'DIGITAL_AMPLITUDE_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'DIGITAL_HIGH_N': 'd', 'MARKER2_SKEW_N': 'd', 'MARKER1_SKEW_N': 'd', 'MARKER2_OFFSET_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'PHASE_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'MARKER1_HIGH_N': 'd', 'EXTERNAL_ADD_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'ANALOG_HIGH_N': 'd', 'MARKER2_HIGH_N': 'd', 'ANALOG_FILTER_N': 'h', 'ANALOG_METHOD_N': 'h', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER1_LOW_N': 'd', 'MARKER1_METHOD_N': 'h', 'MARKER2_METHOD_N': 'h', 'ANALOG_OFFSET_N': 'd', 'ANALOG_LOW_N': 'd', 'DELAY_IN_TIME_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'DELAY_IN_POINTS_N': 'd', 'MARKER1_OFFSET_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'DIGITAL_METHOD_N': 'h', 'DIGITAL_LOW_N': 'd', 'MARKER2_LOW_N': 'd', 'CHANNEL_STATE_N': 'h', 'CHANNEL_SKEW_N': 'd'}¶
-
-
AWG_FILE_FORMAT_HEAD = {'INTERLEAVE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'REFERENCE_SOURCE': 'h', 'SAMPLING_RATE': 'd', 'REPETITION_RATE': 'd', 'INTERNAL_TRIGGER_RATE': 'd', 'ZEROING': 'h', 'RUN_MODE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'HOLD_REPETITION_RATE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'WAIT_VALUE': 'h', 'COUPLING': 'h', 'JUMP_TIMING': 'h', 'TRIGGER_SOURCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'CLOCK_SOURCE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'DIVIDER_RATE': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'RUN_STATE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h'}¶
+AWG_FILE_FORMAT_HEAD = {'INTERLEAVE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'COUPLING': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'REPETITION_RATE': 'd', 'JUMP_TIMING': 'h', 'TRIGGER_SOURCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'RUN_MODE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'DIVIDER_RATE': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'HOLD_REPETITION_RATE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'WAIT_VALUE': 'h', 'ZEROING': 'h', 'REFERENCE_SOURCE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'RUN_STATE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'SAMPLING_RATE': 'd', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'CLOCK_SOURCE': 'h'}¶