splitting into DM and camera classes

aditya-sengupta · Dec 15, 2024 · 06a3529 · 06a3529
1 parent 3f7df12
commit 06a3529
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 7 deletions.
diff --git a/write_and_delete/day1_daytime_intensities.py → ...te_and_delete/day1_daytime_intensities.py b/write_and_delete/day1_daytime_intensities.py → ...te_and_delete/day1_daytime_intensities.py
diff --git a/write_and_delete/day1_onsky_intensities.py → ...rite_and_delete/day1_onsky_intensities.py b/write_and_delete/day1_onsky_intensities.py → ...rite_and_delete/day1_onsky_intensities.py
diff --git a/write_and_delete/day1_telemetry.py → depr/write_and_delete/day1_telemetry.py b/write_and_delete/day1_telemetry.py → depr/write_and_delete/day1_telemetry.py
diff --git a/write_and_delete/day2_daytime_modes.py → depr/write_and_delete/day2_daytime_modes.py b/write_and_delete/day2_daytime_modes.py → depr/write_and_delete/day2_daytime_modes.py
diff --git a/write_and_delete/day2_daytime_random.py → depr/write_and_delete/day2_daytime_random.py b/write_and_delete/day2_daytime_random.py → depr/write_and_delete/day2_daytime_random.py
diff --git a/write_and_delete/example_lantern_flux.jl → .../write_and_delete/example_lantern_flux.jl b/write_and_delete/example_lantern_flux.jl → .../write_and_delete/example_lantern_flux.jl
diff --git a/write_and_delete/onsky_lantern_flux.jl → depr/write_and_delete/onsky_lantern_flux.jl b/write_and_delete/onsky_lantern_flux.jl → depr/write_and_delete/onsky_lantern_flux.jl
diff --git a/write_and_delete/pl_230530_flux.jl → depr/write_and_delete/pl_230530_flux.jl b/write_and_delete/pl_230530_flux.jl → depr/write_and_delete/pl_230530_flux.jl
diff --git a/write_and_delete/pl_230713_flux.jl → depr/write_and_delete/pl_230713_flux.jl b/write_and_delete/pl_230713_flux.jl → depr/write_and_delete/pl_230713_flux.jl
diff --git a/write_and_delete/pl_230808_flux.jl → depr/write_and_delete/pl_230808_flux.jl b/write_and_delete/pl_230808_flux.jl → depr/write_and_delete/pl_230808_flux.jl
diff --git a/write_and_delete/pl_230903.py → depr/write_and_delete/pl_230903.py b/write_and_delete/pl_230903.py → depr/write_and_delete/pl_230903.py
diff --git a/..._and_delete/telemetry_lantern_matching.jl → ..._and_delete/telemetry_lantern_matching.jl b/..._and_delete/telemetry_lantern_matching.jl → ..._and_delete/telemetry_lantern_matching.jl
diff --git a/photonics/experiments/experiments.py b/photonics/experiments/experiments.py
diff --git a/photonics/experiments/lantern_cameras.py b/photonics/experiments/lantern_cameras.py
@@ -2,6 +2,9 @@
 import numpy as np
 import dao
 
+from ..simulations.optics import Optics
+from ..simulations.lantern_optics import LanternOptics
+
 class LanternCamera(ABC):
     def set_centroids(self, centroids, image, save=False):
         """
@@ -93,12 +96,13 @@ def gain(self, val):
 
     @property
     def fps(self):
-        return self.fps.get_data()
+        return self.fpsshm.get_data()
 
     @fps.setter
     def set_fps(self, val):
         self.fpsshm.set_data(self.fps.get_data() * 0 + val)
 
-class SimLanternCamera(LanternCamera):
+class SimulatedLanternCamera(LanternCamera):
     def __init__(self):
-        pass
+        self.optics = Optics()
+        self.lantern_optics = LanternOptics(optics)
diff --git a/photonics/linearity.py b/photonics/linearity.py
@@ -110,6 +110,3 @@ def plot_linearity(amplitudes, responses, title_mod="", savepath="", zlabels=Non
 	else:
 		print("Not saving this figure, specify 'savepath' if desired!")
 
-def linearity_loss(amplitudes, linearity_responses):
-    comparison = np.eye(linearity_responses.shape[2])[:, np.newaxis, :]
-    return np.sum((comparison * amplitudes[np.newaxis, :, np.newaxis] - linearity_responses) ** 2)
diff --git a/photonics/simulations/lantern_optics.py b/photonics/simulations/lantern_optics.py
@@ -334,4 +334,5 @@ def gs_inject_recover(self, zernikes, amplitudes, optics):
 
 	def set_gs_slopes(self, optics):
 		gs_slopes = [(self.gs_inject_recover(i, 0.1, optics)[i] - self.gs_inject_recover(i, -0.1, optics)[i]) / (0.2) for i in range(self.nmodes)]
-		self.gs_slopes = np.array(gs_slopes)
+		self.gs_slopes = np.array(gs_slopes)
+
diff --git a/photonics/simulations/pyramid_optics.py → scripts_py/spie24/pyramid_optics.py b/photonics/simulations/pyramid_optics.py → scripts_py/spie24/pyramid_optics.py
diff --git a/photonics/simulations/second_stage.py → scripts_py/spie24/second_stage.py b/photonics/simulations/second_stage.py → scripts_py/spie24/second_stage.py
diff --git a/photonics/simulations/wfs_filter.py → scripts_py/spie24/wfs_filter.py b/photonics/simulations/wfs_filter.py → scripts_py/spie24/wfs_filter.py