Reverted, switching back to toy

Author: Jammy2211

autoarray/dataset/imaging.py

@@ -13,7 +13,7 @@
 logger = logging.getLogger(__name__)
 
 
-class AbstractImagingSet(abstract_dataset.AbstractDataset):
+class AbstractImagingDataSet(abstract_dataset.AbstractDataset):
     @property
     def image(self):
         return self.data
@@ -331,7 +331,9 @@ def output_to_fits(
         overwrite=False,
     ):
         self.image.output_to_fits(file_path=image_path, overwrite=overwrite)
-        self.psf.output_to_fits(file_path=psf_path, overwrite=overwrite)
+
+        if self.psf is not None and psf_path is not None:
+            self.psf.output_to_fits(file_path=psf_path, overwrite=overwrite)
 
         if self.noise_map is not None and noise_map_path is not None:
             self.noise_map.output_to_fits(file_path=noise_map_path, overwrite=overwrite)
@@ -360,7 +362,7 @@ def output_to_fits(
             )
 
 
-class Imaging(AbstractImagingSet):
+class Imaging(AbstractImagingDataSet):
     def __init__(
         self,
         image,
@@ -464,9 +466,9 @@ def from_fits(
         lens_name=None,
     ):
         """Factory for loading the imaging data_type from .fits files, as well as computing properties like the noise-map,
-        exposure-time map, etc. from the imaging-simulator.
+        exposure-time map, etc. from the imaging-data.
 
-        This factory also includes a number of routines for converting the imaging-simulator from units not supported by PyAutoLens \
+        This factory also includes a number of routines for converting the imaging-data from units not supported by PyAutoLens \
         (e.g. adus, electrons) to electrons per second.
 
         Parameters
@@ -659,7 +661,7 @@ def simulate(
         exposure_time,
         psf=None,
         exposure_time_map=None,
-        background_sky_level=0.0,
+        background_level=0.0,
         background_sky_map=None,
         add_noise=True,
         noise_if_add_noise_false=0.1,
@@ -702,7 +704,7 @@ def simulate(
 
         if background_sky_map is None:
             background_sky_map = arrays.Array.full(
-                fill_value=background_sky_level, shape_2d=image.shape_2d
+                fill_value=background_level, shape_2d=image.shape_2d
             )
 
         image += background_sky_map
@@ -730,7 +732,7 @@ def simulate(
             )
         else:
             noise_map = arrays.Array.full(
-                fill_value=noise_if_add_noise_false, shape_2d=image.shape_2d
+                fill_value=noise_if_add_noise_false, shape_2d=image.shape_2d, pixel_scales=image.pixel_scales
             )
             noise_realization = None
 

autoarray/dataset/interferometer.py

@@ -273,7 +273,7 @@ def simulate(
         transformer,
         primary_beam=None,
         exposure_time_map=None,
-        background_sky_level=0.0,
+        background_level=0.0,
         background_sky_map=None,
         noise_sigma=None,
         noise_if_add_noise_false=0.1,
@@ -316,7 +316,7 @@ def simulate(
         if background_sky_map is None:
 
             background_sky_map = aa.array.full(
-                fill_value=background_sky_level,
+                fill_value=background_level,
                 shape_2d=real_space_image.shape_2d,
                 pixel_scales=real_space_pixel_scales,
             )

autoarray/exc.py

@@ -2,10 +2,6 @@ class ArrayException(Exception):
     pass
 
 
-class ScaledException(Exception):
-    pass
-
-
 class GridException(Exception):
     pass
 
@@ -14,7 +10,7 @@ class KernelException(Exception):
     pass
 
 
-class ConvolutionException(Exception):
+class ConvolverException(Exception):
     pass
 
 
@@ -36,3 +32,7 @@ class PixelizationException(Exception):
 
 class InversionException(Exception):
     pass
+
+
+class PlottingException(Exception):
+    pass

autoarray/fit/fit.py

@@ -3,6 +3,8 @@
 from autoarray.masked import masked_dataset as md
 from autoarray.util import fit_util
 
+def fit_masked_dataset(masked_dataset, model_data, inversion=None):
+    return fit(masked_dataset=masked_dataset, model_data=model_data, inversion=inversion)
 
 def fit(masked_dataset, model_data, inversion=None):
     if isinstance(masked_dataset, md.MaskedImaging):

autoarray/mask/geometry.py

@@ -27,19 +27,19 @@ def central_pixel_coordinates(self):
     def origin(self):
         return self.mask.origin
 
-    def pixel_coordinates_from_arcsec_coordinates(self, arcsec_coordinates):
+    def pixel_coordinates_from_scaled_coordinates(self, scaled_coordinates):
         return (
             int(
                 (
-                    (-arcsec_coordinates[0] + self.mask.origin[0])
+                    (-scaled_coordinates[0] + self.mask.origin[0])
                     / self.mask.pixel_scales[0]
                 )
                 + self.central_pixel_coordinates[0]
                 + 0.5
             ),
             int(
                 (
-                    (arcsec_coordinates[1] - self.mask.origin[1])
+                    (scaled_coordinates[1] - self.mask.origin[1])
                     / self.mask.pixel_scales[1]
                 )
                 + self.central_pixel_coordinates[1]
@@ -53,46 +53,46 @@ def mask_centre(self):
         return grid_util.grid_centre_from_grid_1d(grid_1d=self.masked_grid)
 
     @property
-    def shape_2d_arcsec(self):
+    def shape_2d_scaled(self):
         return (
             float(self.mask.pixel_scales[0] * self.mask.shape[0]),
             float(self.mask.pixel_scales[1] * self.mask.shape[1]),
         )
 
     @property
-    def arc_second_maxima(self):
+    def scaled_maxima(self):
         return (
-            (self.shape_2d_arcsec[0] / 2.0) + self.mask.origin[0],
-            (self.shape_2d_arcsec[1] / 2.0) + self.mask.origin[1],
+            (self.shape_2d_scaled[0] / 2.0) + self.mask.origin[0],
+            (self.shape_2d_scaled[1] / 2.0) + self.mask.origin[1],
         )
 
     @property
-    def arc_second_minima(self):
+    def scaled_minima(self):
         return (
-            (-(self.shape_2d_arcsec[0] / 2.0)) + self.mask.origin[0],
-            (-(self.shape_2d_arcsec[1] / 2.0)) + self.mask.origin[1],
+            (-(self.shape_2d_scaled[0] / 2.0)) + self.mask.origin[0],
+            (-(self.shape_2d_scaled[1] / 2.0)) + self.mask.origin[1],
         )
 
     @property
     def extent(self):
         return np.asarray(
             [
-                self.arc_second_minima[1],
-                self.arc_second_maxima[1],
-                self.arc_second_minima[0],
-                self.arc_second_maxima[0],
+                self.scaled_minima[1],
+                self.scaled_maxima[1],
+                self.scaled_minima[0],
+                self.scaled_maxima[0],
             ]
         )
 
     @property
     def yticks(self):
         """Compute the yticks labels of this grid, used for plotting the y-axis ticks when visualizing an image-grid"""
-        return np.linspace(self.arc_second_minima[0], self.arc_second_maxima[0], 4)
+        return np.linspace(self.scaled_minima[0], self.scaled_maxima[0], 4)
 
     @property
     def xticks(self):
         """Compute the xticks labels of this grid, used for plotting the x-axis ticks when visualizing an image-grid"""
-        return np.linspace(self.arc_second_minima[1], self.arc_second_maxima[1], 4)
+        return np.linspace(self.scaled_minima[1], self.scaled_maxima[1], 4)
 
     @property
     def unmasked_grid(self):
@@ -143,7 +143,7 @@ def border_grid(self):
             grid_1d=border_grid_1d
         )
 
-    def grid_pixels_from_grid_arcsec(self, grid_arcsec_1d):
+    def grid_pixels_from_grid_scaled_1d(self, grid_scaled_1d):
         """Convert a grid of (y,x) arc second coordinates to a grid of (y,x) pixel values. Pixel coordinates are \
         returned as floats such that they include the decimal offset from each pixel's top-left corner.
 
@@ -155,18 +155,18 @@ def grid_pixels_from_grid_arcsec(self, grid_arcsec_1d):
 
         Parameters
         ----------
-        grid_arcsec_1d: ndarray
+        grid_scaled_1d: ndarray
             A grid of (y,x) coordinates in arc seconds.
         """
-        grid_pixels_1d = grid_util.grid_pixels_1d_from_grid_arcsec_1d_shape_2d_and_pixel_scales(
-            grid_arcsec_1d=grid_arcsec_1d,
+        grid_pixels_1d = grid_util.grid_pixels_1d_from_grid_scaled_1d_shape_2d_and_pixel_scales(
+            grid_scaled_1d=grid_scaled_1d,
             shape_2d=self.mask.shape,
             pixel_scales=self.mask.pixel_scales,
             origin=self.mask.origin,
         )
         return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_pixels_1d)
 
-    def grid_pixel_centres_from_grid_arcsec_1d(self, grid_arcsec_1d):
+    def grid_pixel_centres_from_grid_scaled_1d(self, grid_scaled_1d):
         """Convert a grid of (y,x) arc second coordinates to a grid of (y,x) pixel values. Pixel coordinates are \
         returned as integers such that they map directly to the pixel they are contained within.
 
@@ -178,11 +178,11 @@ def grid_pixel_centres_from_grid_arcsec_1d(self, grid_arcsec_1d):
 
         Parameters
         ----------
-        grid_arcsec_1d: ndarray
+        grid_scaled_1d: ndarray
             The grid of (y,x) coordinates in arc seconds.
         """
-        grid_pixel_centres_1d = grid_util.grid_pixel_centres_1d_from_grid_arcsec_1d_shape_2d_and_pixel_scales(
-            grid_arcsec_1d=grid_arcsec_1d,
+        grid_pixel_centres_1d = grid_util.grid_pixel_centres_1d_from_grid_scaled_1d_shape_2d_and_pixel_scales(
+            grid_scaled_1d=grid_scaled_1d,
             shape_2d=self.mask.shape,
             pixel_scales=self.mask.pixel_scales,
             origin=self.mask.origin,
@@ -191,7 +191,7 @@ def grid_pixel_centres_from_grid_arcsec_1d(self, grid_arcsec_1d):
         )
         return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_pixel_centres_1d)
 
-    def grid_pixel_indexes_from_grid_arcsec_1d(self, grid_arcsec_1d):
+    def grid_pixel_indexes_from_grid_scaled_1d(self, grid_scaled_1d):
         """Convert a grid of (y,x) arc second coordinates to a grid of (y,x) pixel 1D indexes. Pixel coordinates are \
         returned as integers such that they are the pixel from the top-left of the 2D grid going rights and then \
         downwards.
@@ -207,11 +207,11 @@ def grid_pixel_indexes_from_grid_arcsec_1d(self, grid_arcsec_1d):
 
         Parameters
         ----------
-        grid_arcsec_1d: ndarray
+        grid_scaled_1d: ndarray
             The grid of (y,x) coordinates in arc seconds.
         """
-        grid_pixel_indexes_1d = grid_util.grid_pixel_indexes_1d_from_grid_arcsec_1d_shape_2d_and_pixel_scales(
-            grid_arcsec_1d=grid_arcsec_1d,
+        grid_pixel_indexes_1d = grid_util.grid_pixel_indexes_1d_from_grid_scaled_1d_shape_2d_and_pixel_scales(
+            grid_scaled_1d=grid_scaled_1d,
             shape_2d=self.mask.shape,
             pixel_scales=self.mask.pixel_scales,
             origin=self.mask.origin,
@@ -220,7 +220,7 @@ def grid_pixel_indexes_from_grid_arcsec_1d(self, grid_arcsec_1d):
         )
         return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_pixel_indexes_1d)
 
-    def grid_arcsec_from_grid_pixels_1d(self, grid_pixels_1d):
+    def grid_scaled_from_grid_pixels_1d(self, grid_pixels_1d):
         """Convert a grid of (y,x) pixel coordinates to a grid of (y,x) arc second values.
 
         The pixel coordinate origin is at the top left corner of the grid, such that the pixel [0,0] corresponds to \
@@ -234,23 +234,23 @@ def grid_arcsec_from_grid_pixels_1d(self, grid_pixels_1d):
         grid_pixels_1d : ndarray
             The grid of (y,x) coordinates in pixels.
         """
-        grid_arcsec_1d = grid_util.grid_arcsec_1d_from_grid_pixels_1d_shape_2d_and_pixel_scales(
+        grid_scaled_1d = grid_util.grid_scaled_1d_from_grid_pixels_1d_shape_2d_and_pixel_scales(
             grid_pixels_1d=grid_pixels_1d,
             shape_2d=self.mask.shape,
             pixel_scales=self.mask.pixel_scales,
             origin=self.mask.origin,
         )
-        return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_arcsec_1d)
+        return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_scaled_1d)
 
     @property
     def sub_size(self):
         return self.mask.sub_size
 
-    def grid_arcsec_from_grid_pixels_1d_for_marching_squares(
+    def grid_scaled_from_grid_pixels_1d_for_marching_squares(
         self, grid_pixels_1d, shape_2d
     ):
 
-        grid_arcsec_1d = grid_util.grid_arcsec_1d_from_grid_pixels_1d_shape_2d_and_pixel_scales(
+        grid_scaled_1d = grid_util.grid_scaled_1d_from_grid_pixels_1d_shape_2d_and_pixel_scales(
             grid_pixels_1d=grid_pixels_1d,
             shape_2d=shape_2d,
             pixel_scales=(
@@ -260,10 +260,10 @@ def grid_arcsec_from_grid_pixels_1d_for_marching_squares(
             origin=self.mask.origin,
         )
 
-        grid_arcsec_1d[:, 0] -= self.mask.pixel_scales[0] / (2.0 * self.mask.sub_size)
-        grid_arcsec_1d[:, 1] += self.mask.pixel_scales[1] / (2.0 * self.mask.sub_size)
+        grid_scaled_1d[:, 0] -= self.mask.pixel_scales[0] / (2.0 * self.mask.sub_size)
+        grid_scaled_1d[:, 1] += self.mask.pixel_scales[1] / (2.0 * self.mask.sub_size)
 
-        return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_arcsec_1d)
+        return self.mask.mapping.grid_from_grid_1d(grid_1d=grid_scaled_1d)
 
     @property
     def masked_sub_grid(self):
@@ -286,8 +286,8 @@ def sub_border_grid_1d(self):
     @property
     def _zoom_centre(self):
 
-        extraction_grid_1d = self.mask.geometry.grid_pixels_from_grid_arcsec(
-            grid_arcsec_1d=self.masked_grid.in_1d
+        extraction_grid_1d = self.mask.geometry.grid_pixels_from_grid_scaled_1d(
+            grid_scaled_1d=self.masked_grid.in_1d
         )
         y_pixels_max = np.max(extraction_grid_1d[:, 0])
         y_pixels_min = np.min(extraction_grid_1d[:, 0])
@@ -311,7 +311,7 @@ def _zoom_offset_pixels(self):
         )
 
     @property
-    def _zoom_offset_arcsec(self):
+    def _zoom_offset_scaled(self):
 
         return (
             -self.mask.pixel_scales[0] * self._zoom_offset_pixels[0],