Changes requested

spacetelescope · Jul 19, 2024 · 926695f · 926695f
1 parent e10136b
commit 926695f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/testbed_example/example_optical_model.py b/testbed_example/example_optical_model.py
@@ -12,7 +12,7 @@ class ExampleOpticalModel(OpticalModel):
     def __init__(self, config, wavelength=700e-9):
         super().__init__()
 
-        self.config = config['simulator']
+        self.config = config
         self.wavelength = wavelength
 
         @self.register_plane('detector', 'pupil')
@@ -33,10 +33,6 @@ def pupil_grid(self):
 
         return hcipy.make_uniform_grid(dims, size)
 
-    @property
-    def focal_grid(self):
-        return hcipy.make_focal_grid(12, 32)
-
     @property
     def detector_grid(self):
         roi = self.config['detector']['roi']

diff --git a/testbed_example/services/example_simulator/example_simulator.py b/testbed_example/services/example_simulator/example_simulator.py
@@ -12,11 +12,11 @@ def __init__(self):
         super().__init__('example_simulator')
 
     def open(self):
-        self.model = ExampleOpticalModel(self.testbed.config)
+        self.model = ExampleOpticalModel(self.testbed.config['simulator'])
         wavefronts = [hcipy.Wavefront(self.model.pupil_grid.ones() * 1e6)]
         self.model.set_wavefronts('light_source', wavefronts)
 
-        self.images = self.make_data_stream('images', 'float64', self.model.focal_grid.shape, 20)
+        self.images = self.make_data_stream('images', 'float64', self.model.detector_grid.shape, 20)
 
     def camera_readout(self, camera_name, power):
         image = power.shaped