summaryrefslogtreecommitdiffstats
path: root/lab_control/frequency_response.py
diff options
context:
space:
mode:
Diffstat (limited to 'lab_control/frequency_response.py')
-rw-r--r--lab_control/frequency_response.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/lab_control/frequency_response.py b/lab_control/frequency_response.py
index ca2002e..af399b1 100644
--- a/lab_control/frequency_response.py
+++ b/lab_control/frequency_response.py
@@ -1,13 +1,14 @@
from lab_control.function_generator import FunctionGenerator
from lab_control.oscilloscope import Oscilloscope
+from lab_control.measurement import Measurement
-class FrequencyResponseMeasurement:
+class FrequencyResponseMeasurement(Measurement):
def __init__(self):
- self.minFrequency = None
- self.maxFrequency = None
- self.steps = None
- self.functionGeneratorChannel = None
- self.oscilloscopeChannel = None
+ self.minFrequency = 20e0
+ self.maxFrequency = 16e3
+ self.steps = 50
+ self.functionGeneratorChannel = 1
+ self.oscilloscopeChannel = 1
self.measurementDone = False
self.data = None
@@ -22,4 +23,3 @@ class FrequencyResponseMeasurement:
self.data.append((frequency, response))
self.measurementDone = True
-