Add option num-meas-skip

2 files changed, 26 insertions, 3 deletions

diff --git a/amplitude_ramp.py b/amplitude_ramp.py
index f6d1c5b..a80dbf7 100755
--- a/amplitude_ramp.py
+++ b/amplitude_ramp.py
@@ -188,6 +188,7 @@ class RampGenerator(threading.Thread):
         self.in_queue_ = Queue()
 
         self.num_meas = int(options.num_meas)
+        self.num_meas_to_skip = int(options.num_meas_to_skip)
         self.ampl_start = float(options.ampl_start)
         self.ampl_step = float(options.ampl_step)
         self.ampl_stop = float(options.ampl_stop)
@@ -229,6 +230,10 @@ class RampGenerator(threading.Thread):
             phase_diff_sum = 0
             mag_feedback_sum = 0
 
+            for measurement_ignore in range(self.num_meas_to_skip):
+                # Receive and ignore three floats on the socket
+                sock.recv(12)
+
             for measurement_ix in range(self.num_meas):
                 # Receive three floats on the socket
                 mag_gen, phase_diff, mag_feedback = struct.unpack(
@@ -280,6 +285,11 @@ parser.add_argument('--num-meas',
         help='number of measurements per amplitude',
         required=False)
 
+parser.add_argument('--num-meas-to-skip',
+        default='50',
+        help='After each amplitude change, ignore num-meas-to-skip measurements',
+        required=False)
+
 cli_args = parser.parse_args()
 
 rampgen = RampGenerator(cli_args)
diff --git a/plot.py b/plot.py
index a4faf89..8e1411a 100755
--- a/plot.py
+++ b/plot.py
@@ -13,12 +13,25 @@ import matplotlib.pyplot as pp
 
 measurements = np.loadtxt("measurements.csv", delimiter=",")
 
+mag_gen = measurements[..., 1]
+mag_feedback = measurements[..., 2]
+phase_diff = measurements[..., 3]
+
+pp.figure()
 pp.subplot(311)
-pp.plot(measurements[..., 1])
+pp.plot(mag_gen)
 pp.subplot(312)
-pp.plot(measurements[..., 2])
+pp.plot(mag_feedback)
 pp.subplot(313)
-pp.plot(measurements[..., 3])
+pp.plot(phase_diff)
+
+pp.figure()
+pp.scatter(mag_gen, mag_feedback)
+
+pp.figure()
+mag_gen_norm = mag_gen / mag_gen.max()
+mag_feedback_norm = mag_feedback / mag_feedback.max()
+pp.plot(mag_gen_norm - mag_feedback_norm)
 
 pp.show()