Implemented interferometer_fit visualization methods

Author: Jammy2211

autoarray/dataset/interferometer.py

@@ -5,6 +5,7 @@
 
 from autoarray import exc
 from autoarray.dataset import abstract_dataset
+from autoarray.structures import visibilities as vis
 
 
 logger = logging.getLogger(__name__)
@@ -239,11 +240,14 @@ def from_fits(
             file_path=uv_wavelengths_path, hdu=uv_wavelengths_hdu
         )
 
-        primary_beam = aa.kernel.from_fits(
-            file_path=primary_beam_path,
-            hdu=primary_beam_hdu,
-            renormalize=renormalize_primary_beam,
-        )
+        if primary_beam_path is not None:
+            primary_beam = aa.kernel.from_fits(
+                file_path=primary_beam_path,
+                hdu=primary_beam_hdu,
+                renormalize=renormalize_primary_beam,
+            )
+        else:
+            primary_beam = None
 
         interferometer = Interferometer(
             visibilities=visibilities,
@@ -333,6 +337,8 @@ def simulate(
             )
             noise_map_realization = None
 
+        noise_map = vis.Visibilities.manual_1d(visibilities=noise_map)
+
         if np.isnan(noise_map).any():
             raise exc.DataException(
                 "The noise-map has NaN values in it. This suggests your exposure time and / or"

autoarray/fit/fit.py

@@ -176,6 +176,10 @@ def __init__(self, mask, image, noise_map, model_image, inversion=None):
             inversion=inversion,
         )
 
+    @property
+    def masked_imaging(self):
+        return self.masked_dataset
+
     @property
     def image(self):
         return self.data
@@ -232,6 +236,10 @@ def __init__(
             inversion=inversion,
         )
 
+    @property
+    def masked_interferometer(self):
+        return self.masked_dataset
+
     @property
     def visibilities_mask(self):
         return self.mask

autoarray/mask/geometry.py

@@ -18,7 +18,10 @@ def regions(self):
 
     @property
     def central_pixel_coordinates(self):
-        return float(self.mask.shape_2d[0] - 1) / 2, float(self.mask.shape_2d[1] - 1) / 2
+        return (
+            float(self.mask.shape_2d[0] - 1) / 2,
+            float(self.mask.shape_2d[1] - 1) / 2,
+        )
 
     @property
     def origin(self):
@@ -105,7 +108,9 @@ def unmasked_grid(self):
             origin=self.mask.origin,
         )
 
-        return self.mask.regions.unmasked_mask.mapping.grid_from_grid_1d(grid_1d=grid_1d)
+        return self.mask.regions.unmasked_mask.mapping.grid_from_grid_1d(
+            grid_1d=grid_1d
+        )
 
     @property
     def masked_grid(self):

autoarray/masked/masked_dataset.py

@@ -235,12 +235,10 @@ def __init__(
         if self.interferometer.primary_beam is None:
             self.primary_beam_shape_2d = None
         elif (
-                primary_beam_shape_2d is None
-                and self.interferometer.primary_beam is not None
+            primary_beam_shape_2d is None
+            and self.interferometer.primary_beam is not None
         ):
-            self.primary_beam_shape_2d = (
-                self.interferometer.primary_beam.shape_2d
-            )
+            self.primary_beam_shape_2d = self.interferometer.primary_beam.shape_2d
         else:
             self.primary_beam_shape_2d = primary_beam_shape_2d
 

autoarray/operators/fourier_transform.py

@@ -7,7 +7,7 @@
 class Transformer(object):
     def __init__(self, uv_wavelengths, grid_radians, preload_transform=True):
 
-        self.uv_wavelengths = uv_wavelengths.astype('float')
+        self.uv_wavelengths = uv_wavelengths.astype("float")
         self.grid_radians = grid_radians.in_1d_binned
 
         self.total_visibilities = uv_wavelengths.shape[0]

autoarray/plotters/__init__.py

@@ -7,5 +7,6 @@
 from autoarray.plotters import imaging_plotters as imaging
 from autoarray.plotters import interferometer_plotters as interferometer
 from autoarray.plotters import fit_imaging_plotters as fit_imaging
+from autoarray.plotters import fit_interferometer_plotters as fit_interferometer
 from autoarray.plotters import mapper_plotters as mapper
 from autoarray.plotters import inversion_plotters as inversion

autoarray/plotters/array_plotters.py

@@ -212,10 +212,7 @@ def plot_array(
         kpc_per_arcsec=kpc_per_arcsec,
     )
     plot_mask(
-        mask=mask,
-        units=units,
-        kpc_per_arcsec=kpc_per_arcsec,
-        pointsize=mask_pointsize,
+        mask=mask, units=units, kpc_per_arcsec=kpc_per_arcsec, pointsize=mask_pointsize
     )
     plotter_util.plot_lines(line_lists=lines)
     plot_border(
@@ -240,10 +237,7 @@ def plot_array(
         pointsize=grid_pointsize,
     )
     plot_centres(
-        array=array,
-        centres=centres,
-        units=units,
-        kpc_per_arcsec=kpc_per_arcsec,
+        array=array, centres=centres, units=units, kpc_per_arcsec=kpc_per_arcsec
     )
     plot_ellipses(
         fig=fig,
@@ -373,12 +367,7 @@ def get_extent(array, extent, units, kpc_per_arcsec, xticks_manual, yticks_manua
     elif units in "arcsec" or kpc_per_arcsec is None:
         return extent
     elif units in "kpc":
-        return list(
-            map(
-                lambda tick: tick * kpc_per_arcsec,
-                extent,
-            )
-        )
+        return list(map(lambda tick: tick * kpc_per_arcsec, extent))
     else:
         raise exc.PlottingException(
             "The units supplied to the plotted are not a valid string (must be pixels | "
@@ -584,9 +573,7 @@ def plot_centres(array, centres, units, kpc_per_arcsec):
                 )
 
 
-def plot_ellipses(
-    fig, array, centres, axis_ratios, phis, units, kpc_per_arcsec,
-):
+def plot_ellipses(fig, array, centres, axis_ratios, phis, units, kpc_per_arcsec):
     """Plot the (y,x) centres (e.g. of a mass profile) on the array as an 'x'.
 
     Parameters
@@ -671,9 +658,7 @@ def plot_mask(mask, units, kpc_per_arcsec, pointsize):
         )
 
 
-def plot_border(
-    mask, include_border, units, kpc_per_arcsec, pointsize,
-):
+def plot_border(mask, include_border, units, kpc_per_arcsec, pointsize):
     """Plot the borders of the mask or the array on the figure.
 
     Parameters
@@ -701,12 +686,15 @@ def plot_border(
             kpc_per_arcsec=kpc_per_arcsec,
         )
 
-        plt.scatter(y=np.asarray(border_units[:, 0]), x=np.asarray(border_units[:, 1]), s=pointsize, c="y")
+        plt.scatter(
+            y=np.asarray(border_units[:, 0]),
+            x=np.asarray(border_units[:, 1]),
+            s=pointsize,
+            c="y",
+        )
 
 
-def plot_points(
-    points_arcsec, array, units, kpc_per_arcsec, pointsize,
-):
+def plot_points(points_arcsec, array, units, kpc_per_arcsec, pointsize):
     """Plot a set of points over the array of data_type on the figure.
 
     Parameters