Fixed unit tests from refactor renames

Author: Jammy2211

autoarray/simulator/simulator.py

@@ -71,7 +71,7 @@ def lsst(
         psf = kernel.Kernel.from_gaussian(
             shape_2d=psf_shape_2d, sigma=psf_sigma, pixel_scales=pixel_scales
         )
-        return ImagingSimulator(
+        return cls(
             shape_2d=shape,
             pixel_scales=pixel_scales,
             sub_size=sub_size,
@@ -103,7 +103,7 @@ def euclid(
         psf = kernel.Kernel.from_gaussian(
             shape_2d=psf_shape_2d, sigma=psf_sigma, pixel_scales=pixel_scales
         )
-        return ImagingSimulator(
+        return cls(
             shape_2d=shape,
             pixel_scales=pixel_scales,
             sub_size=sub_size,
@@ -135,7 +135,7 @@ def hst(
         psf = kernel.Kernel.from_gaussian(
             shape_2d=psf_shape_2d, sigma=psf_sigma, pixel_scales=pixel_scales
         )
-        return ImagingSimulator(
+        return cls(
             shape_2d=shape,
             pixel_scales=pixel_scales,
             sub_size=sub_size,
@@ -168,7 +168,7 @@ def hst_up_sampled(
         psf = kernel.Kernel.from_gaussian(
             shape_2d=psf_shape_2d, sigma=psf_sigma, pixel_scales=pixel_scales
         )
-        return ImagingSimulator(
+        return cls(
             shape_2d=shape,
             pixel_scales=pixel_scales,
             sub_size=sub_size,
@@ -200,7 +200,7 @@ def keck_adaptive_optics(
         psf = kernel.Kernel.from_gaussian(
             shape_2d=psf_shape_2d, sigma=psf_sigma, pixel_scales=pixel_scales
         )
-        return ImagingSimulator(
+        return cls(
             shape_2d=shape,
             pixel_scales=pixel_scales,
             sub_size=sub_size,
@@ -344,7 +344,7 @@ def sma(
         else:
             primary_beam = None
 
-        return InterferometerSimulator(
+        return cls(
             real_space_shape_2d=real_space_shape_2d,
             real_space_pixel_scales=real_space_pixel_scales,
             uv_wavelengths=uv_wavelengths,

test_autoarray/unit/operators/test_fourier_transform.py

@@ -8,7 +8,7 @@ class TestVisiblities(object):
     def test__real_visibilities__intensity_image_all_ones__simple_cases(self):
 
         uv_wavelengths = np.ones(shape=(4, 2))
-        grid_radians = np.ones(shape=(1, 2))
+        grid_radians = aa.grid.manual_2d([[[1.0, 1.0]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -24,7 +24,7 @@ def test__real_visibilities__intensity_image_all_ones__simple_cases(self):
 
         uv_wavelengths = np.array([[0.2, 1.0], [0.5, 1.1], [0.8, 1.2]])
 
-        grid_radians = np.array([[0.1, 0.2], [0.3, 0.4]])
+        grid_radians = aa.grid.manual_2d([[[0.1, 0.2], [0.3, 0.4]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -43,7 +43,7 @@ def test__real_visibilities__intensity_image_all_ones__simple_cases(self):
     def test__real_visibilities__intensity_image_varies__simple_cases(self):
 
         uv_wavelengths = np.ones(shape=(4, 2))
-        grid_radians = np.ones(shape=(1, 2))
+        grid_radians = aa.grid.manual_2d([[[1.0, 1.0]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -59,7 +59,7 @@ def test__real_visibilities__intensity_image_varies__simple_cases(self):
 
         uv_wavelengths = np.array([[0.2, 1.0], [0.5, 1.1], [0.8, 1.2]])
 
-        grid_radians = np.array([[0.1, 0.2], [0.3, 0.4]])
+        grid_radians = aa.grid.manual_2d([[[0.1, 0.2], [0.3, 0.4]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -78,7 +78,7 @@ def test__real_visibilities__intensity_image_varies__simple_cases(self):
     def test__real_visibilities__preload_and_non_preload_give_same_answer(self):
 
         uv_wavelengths = np.ones(shape=(4, 2))
-        grid_radians = np.ones(shape=(1, 2))
+        grid_radians = aa.grid.manual_2d([[[1.0, 1.0]]])
 
         transformer_preload = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -103,7 +103,7 @@ def test__real_visibilities__preload_and_non_preload_give_same_answer(self):
     def test__imag_visibilities__intensity_image_all_ones__simple_cases(self):
 
         uv_wavelengths = np.ones(shape=(4, 2))
-        grid_radians = np.ones(shape=(1, 2))
+        grid_radians = aa.grid.manual_2d([[[1.0, 1.0]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -119,7 +119,7 @@ def test__imag_visibilities__intensity_image_all_ones__simple_cases(self):
 
         uv_wavelengths = np.array([[0.2, 1.0], [0.5, 1.1], [0.8, 1.2]])
 
-        grid_radians = np.array([[0.1, 0.2], [0.3, 0.4]])
+        grid_radians = aa.grid.manual_2d([[[0.1, 0.2], [0.3, 0.4]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -138,7 +138,7 @@ def test__imag_visibilities__intensity_image_all_ones__simple_cases(self):
     def test__imag_visibilities__intensity_image_varies__simple_cases(self):
 
         uv_wavelengths = np.ones(shape=(4, 2))
-        grid_radians = np.ones(shape=(1, 2))
+        grid_radians = aa.grid.manual_2d([[[1.0, 1.0]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -154,7 +154,7 @@ def test__imag_visibilities__intensity_image_varies__simple_cases(self):
 
         uv_wavelengths = np.array([[0.2, 1.0], [0.5, 1.1], [0.8, 1.2]])
 
-        grid_radians = np.array([[0.1, 0.2], [0.3, 0.4]])
+        grid_radians = aa.grid.manual_2d([[[0.1, 0.2], [0.3, 0.4]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -173,7 +173,7 @@ def test__imag_visibilities__intensity_image_varies__simple_cases(self):
     def test__imag_visibilities__preload_and_non_preload_give_same_answer(self):
 
         uv_wavelengths = np.ones(shape=(4, 2))
-        grid_radians = np.ones(shape=(1, 2))
+        grid_radians = aa.grid.manual_2d([[[1.0, 1.0]]])
 
         transformer_preload = aa.transformer(
             uv_wavelengths=uv_wavelengths,
@@ -199,7 +199,7 @@ def test__visiblities_from_image__same_as_individual_calculations_above(self):
 
         uv_wavelengths = np.array([[0.2, 1.0], [0.5, 1.1], [0.8, 1.2]])
 
-        grid_radians = np.array([[0.1, 0.2], [0.3, 0.4]])
+        grid_radians = aa.grid.manual_2d([[[0.1, 0.2], [0.3, 0.4]]])
 
         transformer = aa.transformer(
             uv_wavelengths=uv_wavelengths,