diff options
Diffstat (limited to 'lab_control/frequency_response.py')
| -rw-r--r-- | lab_control/frequency_response.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lab_control/frequency_response.py b/lab_control/frequency_response.py index af399b1..8d46689 100644 --- a/lab_control/frequency_response.py +++ b/lab_control/frequency_response.py @@ -1,6 +1,6 @@ from lab_control.function_generator import FunctionGenerator from lab_control.oscilloscope import Oscilloscope -from lab_control.measurement import Measurement +from lab_control.measurement import Measurement, getLinearRange class FrequencyResponseMeasurement(Measurement): def __init__(self): @@ -13,13 +13,15 @@ class FrequencyResponseMeasurement(Measurement): self.data = None def measure(self, osc: Oscilloscope, fg: FunctionGenerator) -> None: - frequencyRange = self.maxFrequency - self.minFrequency + frequencies = getLinearRange(self.minFrequency, self.maxFrequency, self.steps) self.data = [] - for i in range(0, self.steps): - frequency = self.minFrequency + i * frequencyRange / (self.steps - 1) - fg.setFrequency(self.functionGeneratorChannel, frequency) + for f in frequencies: + fg.setFrequency(self.functionGeneratorChannel, f) response = osc.measureAmplitude(self.oscilloscopeChannel) - self.data.append((frequency, response)) + self.data.append((f, response)) self.measurementDone = True + + def saveToCSV(self, path: str) -> None: + pass |