Interferometer stuff implemented.

Author: Jammy2211

autoarray/plotters/grid_plotters.py

@@ -7,6 +7,7 @@
 import numpy as np
 import itertools
 
+from autoarray.util import array_util
 from autoarray.plotters import plotter_util
 
 
@@ -125,7 +126,7 @@ def plot_grid(
     plotter_util.plot_lines(line_lists=lines)
 
     plt.tick_params(labelsize=xyticksize)
-    plotter_util.output_figure(
+    output_figure(
         array=None,
         as_subplot=as_subplot,
         output_path=output_path,
@@ -250,3 +251,37 @@ def plot_points(grid, points, pointcolor):
                     s=8,
                     color=pointcolor,
                 )
+
+
+def output_figure(array, as_subplot, output_path, output_filename, output_format):
+    """Output the figure, either as an image on the screen or to the hard-disk as a .png or .fits file.
+
+    Parameters
+    -----------
+    array : ndarray
+        The 2D array of image to be output, required for outputting the image as a fits file.
+    as_subplot : bool
+        Whether the figure is part of subplot, in which case the figure is not output so that the entire subplot can \
+        be output instead using the *output_subplot_array* function.
+    output_path : str
+        The path on the hard-disk where the figure is output.
+    output_filename : str
+        The filename of the figure that is output.
+    output_format : str
+        The format the figue is output:
+        'show' - display on computer screen.
+        'png' - output to hard-disk as a png.
+        'fits' - output to hard-disk as a fits file.'
+    """
+    if not as_subplot:
+
+        if output_format is "show":
+            plt.show()
+        elif output_format is "png":
+            plt.savefig(output_path + output_filename + ".png", bbox_inches="tight")
+        elif output_format is "fits":
+            array_util.numpy_array_1d_to_fits(
+                array_1d=array,
+                file_path=output_path + output_filename + ".fits",
+                overwrite=True,
+            )

test_autoarray/unit/conftest.py

@@ -290,9 +290,9 @@ def make_masked_interferometer_7(
 def make_masked_imaging_fit_x1_plane_7x7(masked_imaging_7x7):
     return fit.ImagingFit(
         mask=masked_imaging_7x7.mask,
-        data=masked_imaging_7x7.image,
+        image=masked_imaging_7x7.image,
         noise_map=masked_imaging_7x7.noise_map,
-        model_data=5.0 * masked_imaging_7x7.image,
+        model_image=5.0 * masked_imaging_7x7.image,
     )
 
 @pytest.fixture(name="fit_interferometer_7")