diff --git a/src/python_spectrometer/daq/zurich_instruments.py b/src/python_spectrometer/daq/zurich_instruments.py index 76f520d703c29ed42b6e92fccf601e38a4897ab4..c0872775b56d11ddfa9827ba68558325f921f985 100644 --- a/src/python_spectrometer/daq/zurich_instruments.py +++ b/src/python_spectrometer/daq/zurich_instruments.py @@ -194,7 +194,7 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice): ``freq = 10e3, f_max = 2e3``, the spectrum will have a bandwidth of ``[8e3, 12e3]``. **settings : Mapping - Additional settings for data acqusition. + Additional settings for data acquisition. Notes ----- @@ -225,7 +225,7 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice): .. [1] https://www.zhinst.com/europe/en/resources/principles-of-lock-in-detection """ - settings = self.DAQSettings(freq=freq, **settings).to_consistent_dict() + settings = self.DAQSettings(freq=freq, **settings) if 'bandwidth' in settings: warnings.warn('The bandwidth parameter has been replaced by f_max', @@ -237,6 +237,8 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice): if filter_order is not None: self.device.demods[self.demod].order(int(filter_order)) + settings = settings.to_consistent_dict() + # BW 3dB = √(2^(1/n) - 1) / 2πτ # BW NEP = Γ(n - 1/2) / 4τ √(π)Γ(n) n = self.device.demods[self.demod].order()