Added frequency response measurement initial steps

1 files changed, 10 insertions, 0 deletions

diff --git a/lab_control/frequency_response.py b/lab_control/frequency_response.py
index 6508d80..9f6c79e 100644
--- a/lab_control/frequency_response.py
+++ b/lab_control/frequency_response.py
@@ -1,14 +1,17 @@
 from pathlib import Path
+import time
 
 from lab_control.function_generator import FunctionGenerator
 from lab_control.oscilloscope import Oscilloscope
 from lab_control.measurement import Measurement, getLinearRange
 
+
 class FrequencyResponseMeasurement(Measurement):
     def __init__(self):
         self.minFrequency = 20e0
         self.maxFrequency = 16e3
         self.steps = 50
+        self.inputAmplitude = 0.1
         self.functionGeneratorChannel = 1
         self.oscilloscopeChannel = 1
         self.measurementDone = False
@@ -18,8 +21,15 @@ class FrequencyResponseMeasurement(Measurement):
         frequencies = getLinearRange(self.minFrequency, self.maxFrequency, self.steps)
         self.data = []
 
+        # Initial set up
+        fg.setAmplitude(self.functionGeneratorChannel, self.inputAmplitude)
+        fg.setFunction(self.functionGeneratorChannel, FunctionGenerator.SINE)
+        fg.setOn(self.functionGeneratorChannel)
+        osc.setVoltsPerDivision(self.oscilloscopeChannel, self.inputAmplitude / 6)
+
         for f in frequencies:
             fg.setFrequency(self.functionGeneratorChannel, f)
+            #time.sleep(0.2)
             response = osc.measureAmplitude(self.oscilloscopeChannel)
             self.data.append((f, response))