merge

Author: aditya-sengupta

scripts/kfvib.py

@@ -55,7 +55,7 @@ def plot_cl_rtf(data, timestamp, save=False):
     plt.show()
 
 # start ad hoc modifications to the observe/control matrices
-klqg.R *= 1000
+klqg.R *= 1e6
 # end modifications
 klqg.recompute()
 

scripts/seal_schedule.py

@@ -1,52 +1,18 @@
 import numpy as np
 from matplotlib import pyplot as plt
-import sys
-import re
-from os.path import join
+from sealrtc import loadres
+from sealrtc import joindata
 
 fs = 100
 
-def stamp_to_seconds(t):
-    h, m, s, ms = [int(x) for x in re.search("(\d+):(\d+):(\d+),(\d+)", t).groups()]
-    return 3600 * h + 60 * m + s + 0.001 * ms
+good_run = "2021_11_19_08_44_34"
 
-good_runs = ["07_02_14", "07_04_45", "08_11_19", "08_11_46"]
+res = loadres("lqg/klqg_nstate_18_amp_0.005_ang_0.7854_f_1_tstamp_2021_11_19_08_44_34.csv")
+exposures = res.texp
+measures = res.tmeas
+dmcs = res.tdmc
 
-exposures = []
-measures = []
-dmcs = []
-
-total_nframes = 0
-for fname in good_runs:
-    with open(join("..", "data", "log", f"log_13_11_2021_{fname}.log")) as file:
-        final_frame = np.inf
-        for line in file:
-            time = re.search("\d+:\d+:\d+,\d+", line)[0]
-            seconds = stamp_to_seconds(time)
-            event = re.search("INFO \| (.+)", line)[1]
-            if not any([event.startswith(x) for x in ["Exposure", "Measurement", "DMC"]]):
-                continue
-            frame_num = re.search("\d+", event)
-            if frame_num:
-                frame_num = int(frame_num[0])
-            if event.startswith("Exposure"):
-                exposures.append(seconds)
-            elif event.startswith("Measurement"):
-                measures.append(seconds)
-            elif event.startswith("DMC"):
-                dmcs.append(seconds)
-                final_frame = frame_num
-        total_nframes += final_frame
-        exposures = exposures[:total_nframes]
-        measures = measures[:total_nframes]
-        dmcs = dmcs[:total_nframes]
-
-t0 = exposures[0]
-exposures = np.array(exposures) - t0
-measures = np.array(measures) - t0
-dmcs = np.array(dmcs) - t0
-
-nstart = 1200
+nstart = 600
 npoints = 30
 tstart = exposures[nstart]
 plt.figure(figsize=(8,6))

seal_schedule.pdf

@@ -6,15 +6,15 @@
 def make_experiments():
     optics = make_optics
     # Some predefined experiments
-    short_wait = Experiment(make_noise, 1)
-    med_wait = Experiment(make_noise, 10)
-    long_wait = Experiment(make_noise, 100)
+    short_wait = Experiment(make_noise, 1, optics)
+    med_wait = Experiment(make_noise, 10, optics)
+    long_wait = Experiment(make_noise, 100, optics)
 
-    ustep_tilt = Experiment(make_ustep, 1, tilt_amp=0.005, tip_amp=0.0)
-    ustep_tip = Experiment(make_ustep, 1, tilt_amp=0.0, tip_amp=0.005)
+    ustep_tilt = Experiment(make_ustep, 1, optics, tilt_amp=0.005, tip_amp=0.0)
+    ustep_tip = Experiment(make_ustep, 1, optics, tilt_amp=0.0, tip_amp=0.005)
 
-    sine_one = Experiment(make_sine, 10, amp=0.003, ang=np.pi/4, f=1)
-    sine_five = Experiment(make_sine, 10, amp=0.003, ang=np.pi/4, f=5)
+    sine_one = Experiment(make_sine, 10, optics, amp=0.003, ang=np.pi/4, f=1)
+    sine_five = Experiment(make_sine, 10, optics, amp=0.003, ang=np.pi/4, f=5)
 
     # and some controllers from the controller submodule
     ol = make_openloop()

sealrtc/__init__.py

@@ -3,7 +3,7 @@
 """
 dmdims = (320, 320)
 imdims = (320, 320)
-fs = 50.0 # Hz
+fs = 100.0 # Hz
 dt = 1 / fs
 wav0 = 1.65e-6 #assumed wav0 for sine amplitude input in meters
 beam_ratio = 5.361256544502618 #pixels/resel

sealrtc/constants.py

@@ -4,10 +4,9 @@
 
 import sys
 import logging
-import warnings
+from multiprocessing import Process
+from functools import partial
 
-from threading import Thread
-from abc import ABC
 import numpy as np
 from copy import copy
 
@@ -121,8 +120,8 @@ def run(self, con):
 		t_start = mns()
 
 		processes = [
-			Process(target=scheduled_loop, args=(partial(self.loop_iter, controller), t_start)),
-			Process(target=scheduled_loop, args=(self.disturb_iter, t_start))
+			Process(target=self.scheduled_loop, args=(partial(self.loop_iter, controller), t_start)),
+			Process(target=self.scheduled_loop, args=(self.disturb_iter, t_start))
 		]
 
 		for p in processes:

sealrtc/experiments/experiment.py

@@ -1,4 +1,5 @@
 import time
+import warnings
 import numpy as np
 
 from .optics import Optics
@@ -19,6 +20,7 @@ def __init__(self):
 		self.dmdims = self.getdmc().shape
 		self.imdims = self.getim().shape
 		self.name = "FAST_LODM"
+		self.set_process_vars()
 		port = "5556"
 		context = zmq.Context()
 		self.socket = context.socket(zmq.REQ)

sealrtc/optics/fast.py

@@ -33,6 +33,7 @@ def set_process_vars(self):
 		sidemask = np.zeros(self.imdims)
 		sidemaskind = np.where(sidemaskrho < sidemaskrad)
 		sidemask[sidemaskind] = 1
+		self.mtfgrid = mtfgrid
 		self.sidemask = sidemask
 
 		#central lobe MTF mask