[DEM-943] Changed default arguments.

Author: CumulonimbusCalvus

docs/notebooks/unfinished/example_UHFLI_measurements.py

@@ -15,7 +15,8 @@
 from qtt.measurements.videomode import VideoMode
 
 
-def update_stimulus(is_enabled: bool, signal_output: int = 1, amplitude: float = 0.1, oscillator: int = 1) -> None:
+def update_stimulus(is_enabled: bool, signal_output: int = 1, signal_input: Optional[int] = None,
+                    amplitude: float = 0.1, oscillator: int = 1) -> None:
     """ Sets the enabled status of a demodulator and connects an oscillator to a demodulator.
         After that sets for a signal output, the amplitude and enabled status and finally to  of the UHFLI.
 
@@ -25,11 +26,13 @@ def update_stimulus(is_enabled: bool, signal_output: int = 1, amplitude: float =
     Args:
         is_enabled: True to enable and False to disable.
         signal_output: One of the two outputs on the device.
+        signal_intput: One of the two inputs on the device.
         amplitude: Amplitude in volts, allowed values are 0.0 - 1.5 V.
         demodulator: Which demodulator used to connect to the signal output to.
     """
     demodulator = oscillator
-    signal_input = signal_output
+    if not signal_input:
+        signal_input = signal_output
 
     stimulus.connect_oscillator_to_demodulator(oscillator, demodulator)
     stimulus.set_demodulator_signal_input(demodulator, signal_input)

src/qtt/measurements/acquisition/uhfli_stimulus.py

@@ -50,15 +50,15 @@ def set_output_enabled(self, output: int, is_enabled: bool) -> None:
         qcodes_parameter_name = 'signal_output{}_on'.format(output)
         self._uhfli.parameters[qcodes_parameter_name](enabled)
 
-    def set_oscillator_frequency(self, channel: int, frequency: Optional[float] = None) -> Union[Parameter, None]:
+    def set_oscillator_frequency(self, oscillator: int, frequency: Optional[float] = None) -> Union[Parameter, None]:
         """ Set the oscillators frequencies.
 
         Args:
-            channel: Output channel the the oscillator belongs to (1 - 8) with MF enabled.
+            oscillator: Output channel the the oscillator belongs to (1 - 8) with MF enabled.
             frequency: Optional parameter that if not provided, this method returns a QCoDeS parameter that can be
                     used to set the oscillator frequency. Allowed frequencies are 0 - 600 MHz.
         """
-        qcodes_parameter_name = 'oscillator{}_freq'.format(channel)
+        qcodes_parameter_name = 'oscillator{}_freq'.format(oscillator)
         qcodes_parameter = self._uhfli.parameters[qcodes_parameter_name]
         if frequency is None:
             return qcodes_parameter