Merging complete

Author: Jammy2211

autoarray/operators/inversion/inversions.py

@@ -122,7 +122,7 @@ def residual_map(self):
         return inversion_util.pixelization_residual_map_from_pixelization_values_and_reconstructed_data_1d(
             pixelization_values=self.reconstruction,
             reconstructed_data_1d=self.mapped_reconstructed_image,
-            mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask._mask_1d_index_for_sub_mask_1d_index,
+            mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask.regions._mask_1d_index_for_sub_mask_1d_index,
             all_sub_mask_1d_indexes_for_pixelization_1d_index=self.mapper.all_sub_mask_1d_indexes_for_pixelization_1d_index,
         )
 
@@ -132,7 +132,7 @@ def normalized_residual_map(self):
             pixelization_values=self.reconstruction,
             reconstructed_data_1d=self.mapped_reconstructed_image,
             noise_map_1d=self.noise_map,
-            mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask._mask_1d_index_for_sub_mask_1d_index,
+            mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask.regions._mask_1d_index_for_sub_mask_1d_index,
             all_sub_mask_1d_indexes_for_pixelization_1d_index=self.mapper.all_sub_mask_1d_indexes_for_pixelization_1d_index,
         )
 
@@ -142,7 +142,7 @@ def chi_squared_map(self):
             pixelization_values=self.reconstruction,
             reconstructed_data_1d=self.mapped_reconstructed_image,
             noise_map_1d=self.noise_map,
-            mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask._mask_1d_index_for_sub_mask_1d_index,
+            mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask.regions._mask_1d_index_for_sub_mask_1d_index,
             all_sub_mask_1d_indexes_for_pixelization_1d_index=self.mapper.all_sub_mask_1d_indexes_for_pixelization_1d_index,
         )
 

autoarray/operators/inversion/mappers.py

@@ -244,3 +244,7 @@ def pixelization_1d_index_for_sub_mask_1d_index(self):
         ).astype(
             "int"
         )
+
+    @property
+    def voronoi(self):
+        return self.pixelization_grid.voronoi

autoarray/plotters/inversion_plotters.py

@@ -11,7 +11,7 @@
 
 def subplot(
     inversion,
-    mask=None,
+    mask_overlay=None,
     positions=None,
     grid=None,
     units="arcsec",
@@ -46,10 +46,10 @@ def subplot(
         figsize = figsize_tool
 
     ratio = float(
-        (inversion.mapper.arc_second_maxima[1] - inversion.mapper.arc_second_minima[1])
+        (inversion.mapper.grid.arc_second_maxima[1] - inversion.mapper.grid.arc_second_minima[1])
         / (
-            inversion.mapper.arc_second_maxima[0]
-            - inversion.mapper.arc_second_minima[0]
+            inversion.mapper.grid.arc_second_maxima[0]
+            - inversion.mapper.grid.arc_second_minima[0]
         )
     )
 
@@ -66,7 +66,7 @@ def subplot(
 
     reconstructed_image(
         inversion=inversion,
-        mask=mask,
+        mask_overlay=mask_overlay,
         positions=positions,
         grid=grid,
         as_subplot=True,
@@ -254,7 +254,7 @@ def subplot(
         output_format=output_format,
     )
 
-    plotter_util.output_subaa.plot.array(
+    plotter_util.output_subplot_array(
         output_path=output_path,
         output_filename=output_filename,
         output_format=output_format,
@@ -265,7 +265,7 @@ def subplot(
 
 def reconstructed_image(
     inversion,
-    mask=None,
+    mask_overlay=None,
     positions=None,
     grid=None,
     as_subplot=False,
@@ -295,8 +295,8 @@ def reconstructed_image(
 ):
 
     aa.plot.array(
-        array=inversion.reconstructed_data_2d,
-        mask_overlay=mask,
+        array=inversion.mapped_reconstructed_image,
+        mask_overlay=mask_overlay,
         positions=positions,
         grid=grid,
         as_subplot=as_subplot,
@@ -368,7 +368,7 @@ def reconstruction(
 
     plot_values(
         inversion=inversion,
-        source_pixel_values=inversion.pixelization_values,
+        source_pixel_values=inversion.reconstruction,
         plot_origin=plot_origin,
         positions=positions,
         should_plot_centres=should_plot_centres,