TransformedGrid class in geometry proiles now uses Grid structure

Author: Jammy2211

autoarray/mask/mapping.py

@@ -3,7 +3,7 @@
 from autoarray import exc
 from autoarray.mask import mask as msk
 from autoarray.structures import grids, arrays
-from autoarray.util import binning_util, array_util, grid_util
+from autoarray.util import binning_util, array_util, grid_util, mask_util
 
 
 class Mapping(object):
@@ -349,6 +349,19 @@ def unmasked_blurred_array_2d_from_padded_array_psf_and_image_shape(
             padded_array=blurred_image, image_shape=image_shape
         )
 
+    def rescaled_mask_from_rescale_factor(self, rescale_factor):
+        rescaled_mask = mask_util.rescaled_mask_2d_from_mask_2d_and_rescale_factor(
+            mask_2d=self.mask, rescale_factor=rescale_factor
+        )
+        return msk.Mask(mask_2d=rescaled_mask, pixel_scales=self.mask.pixel_scales, sub_size=self.mask.sub_size, origin=self.mask.origin)
+
+    @property
+    def edge_buffed_mask(self):
+        edge_buffed_mask = mask_util.edge_buffed_mask_2d_from_mask_2d(mask_2d=self.mask).astype(
+            "bool"
+        )
+        return msk.Mask(mask_2d=edge_buffed_mask, pixel_scales=self.mask.pixel_scales, sub_size=self.mask.sub_size, origin=self.mask.origin)
+
     @property
     def mask_sub_1(self):
         return msk.Mask(mask_2d=self.mask, sub_size=1, pixel_scales=self.mask.pixel_scales, origin=self.mask.origin)

autoarray/mask/mask.py

@@ -62,7 +62,8 @@ def __array_finalize__(self, obj):
     @classmethod
     def manual(cls, mask_2d, pixel_scales=None, sub_size=1, origin=(0.0, 0.0), invert=False):
 
-        mask_2d = np.asarray(mask_2d).astype('bool')
+        if type(mask_2d) is list:
+            mask_2d = np.asarray(mask_2d).astype('bool')
 
         if invert:
             mask_2d = np.invert(mask_2d)
@@ -358,7 +359,7 @@ def shape_2d(self):
 
     @property
     def sub_shape_1d(self):
-        return self.pixels_in_mask * self.sub_size ** 2.0
+        return int(self.pixels_in_mask * self.sub_size ** 2.0)
 
     @property
     def sub_shape_2d(self):

autoarray/structures/abstract_structure.py

@@ -119,6 +119,12 @@ def __new__(cls, structure_1d, mask, *args, **kwargs):
         obj.mask = mask
         return obj
 
+    def __array_finalize__(self, obj):
+
+        if isinstance(obj, AbstractStructure):
+
+            self.mask = obj.mask
+
     @property
     def shape_1d(self):
         return self.mask.shape_1d
@@ -127,16 +133,6 @@ def shape_1d(self):
     def sub_shape_1d(self):
         return self.mask.sub_shape_1d
 
-    @property
-    def in_1d(self):
-        return self
-
-    def __array_finalize__(self, obj):
-
-        if isinstance(obj, AbstractStructure):
-
-            self.mask = obj.mask
-
     @property
     def shape_2d(self):
         return self.mask.shape
@@ -145,6 +141,10 @@ def shape_2d(self):
     def sub_shape_2d(self):
         return self.mask.sub_shape_2d
 
+    @property
+    def in_1d(self):
+        return self
+
     @property
     def pixel_scales(self):
         return self.mask.pixel_scales

autoarray/structures/arrays.py

@@ -227,7 +227,8 @@ def from_sub_array_2d_pixel_scales_and_sub_size(cls, sub_array_2d, pixel_scales,
     @classmethod
     def manual_1d(cls, array, shape_2d, pixel_scales=None, sub_size=1, origin=(0.0, 0.0)):
 
-        array = np.asarray(array)
+        if type(array) is list:
+            array = np.asarray(array)
 
         if type(pixel_scales) is float:
             pixel_scales = (pixel_scales, pixel_scales)
@@ -242,7 +243,8 @@ def manual_1d(cls, array, shape_2d, pixel_scales=None, sub_size=1, origin=(0.0,
     @classmethod
     def manual_2d(cls, array, pixel_scales=None, sub_size=1, origin=(0.0, 0.0)):
 
-        array = np.asarray(array)
+        if type(array) is list:
+            array = np.asarray(array)
 
         if type(pixel_scales) is float:
             pixel_scales = (pixel_scales, pixel_scales)
@@ -281,7 +283,8 @@ class MaskedArray(AbstractArray):
     @classmethod
     def manual_1d(cls, array, mask):
 
-        array = np.asarray(array)
+        if type(array) is list:
+            array = np.asarray(array)
 
         if array.shape[0] != mask.sub_pixels_in_mask:
             raise exc.ArrayException('The input 1D array does not have the same number of entries as sub-pixels in'
@@ -292,7 +295,8 @@ def manual_1d(cls, array, mask):
     @classmethod
     def manual_2d(cls, array, mask):
 
-        array = np.asarray(array)
+        if type(array) is list:
+            array = np.asarray(array)
 
         if array.shape != mask.sub_shape_2d:
             raise exc.ArrayException('The input array is 2D but not the same dimensions as the sub-mask '

autoarray/structures/grids.py

@@ -382,7 +382,8 @@ def from_sub_grid_2d_pixel_scales_and_sub_size(cls, sub_grid_2d, pixel_scales, s
     @classmethod
     def manual_1d(cls, grid, shape_2d, pixel_scales=None, sub_size=1, origin=(0.0, 0.0)):
 
-        grid = np.asarray(grid)
+        if type(grid) is list:
+            grid = np.asarray(grid)
 
         if type(pixel_scales) is float:
             pixel_scales = (pixel_scales, pixel_scales)
@@ -400,7 +401,8 @@ def manual_1d(cls, grid, shape_2d, pixel_scales=None, sub_size=1, origin=(0.0, 0
     @classmethod
     def manual_2d(cls, grid, pixel_scales=None, sub_size=1, origin=(0.0, 0.0)):
 
-        grid = np.asarray(grid)
+        if type(grid) is list:
+            grid = np.asarray(grid)
 
         if type(pixel_scales) is float:
             pixel_scales = (pixel_scales, pixel_scales)
@@ -499,8 +501,9 @@ class MaskedGrid(AbstractGrid):
 
     @classmethod
     def manual_1d(cls, grid, mask):
-        
-        grid = np.asarray(grid)
+
+        if type(grid) is list:
+            grid = np.asarray(grid)
 
         if grid.shape[0] != mask.sub_pixels_in_mask:
             raise exc.GridException('The input 1D grid does not have the same number of entries as sub-pixels in'
@@ -511,7 +514,8 @@ def manual_1d(cls, grid, mask):
     @classmethod
     def manual_2d(cls, grid, mask):
 
-        grid = np.asarray(grid)
+        if type(grid) is list:
+            grid = np.asarray(grid)
 
         if (grid.shape[0], grid.shape[1]) != mask.sub_shape_2d:
             raise exc.GridException('The input grid is 2D but not the same dimensions as the sub-mask '
@@ -562,7 +566,8 @@ def __new__(
         nearest_irregular_1d_index_for_mask_1d_index : ndarray
             A 1D array that maps every grid pixel to its nearest pixelization-grid pixel.
         """
-        grid = np.asarray(grid)
+        if type(grid) is list:
+            grid = np.asarray(grid)
         obj = grid.view(cls)
         obj.nearest_irregular_1d_index_for_mask_1d_index = (
             nearest_irregular_1d_index_for_mask_1d_index
@@ -793,13 +798,11 @@ def from_mask_grid_and_pixel_scale_interpolation_grids(
 
         rescale_factor = mask.pixel_scale / pixel_scale_interpolation_grid
 
-        rescaled_mask = mask_util.rescaled_mask_2d_from_mask_2d_and_rescale_factor(
-            mask_2d=mask, rescale_factor=rescale_factor
-        )
+        mask = mask.mapping.mask_sub_1
 
-        interp_mask = mask_util.edge_buffed_mask_2d_from_mask_2d(mask_2d=rescaled_mask).astype(
-            "bool"
-        )
+        rescaled_mask = mask.mapping.rescaled_mask_from_rescale_factor(rescale_factor=rescale_factor)
+
+        interp_mask = rescaled_mask.mapping.edge_buffed_mask
 
         interp_grid = grid_util.grid_1d_via_mask_2d(
             mask_2d=interp_mask,
@@ -813,7 +816,7 @@ def from_mask_grid_and_pixel_scale_interpolation_grids(
 
         return Interpolator(
             grid=grid,
-            interp_grid=interp_grid,
+            interp_grid=MaskedGrid.manual_1d(grid=interp_grid, mask=interp_mask),
             pixel_scale_interpolation_grid=pixel_scale_interpolation_grid,
         )
 

autoarray/structures/visibilities.py

@@ -86,7 +86,8 @@ class Visibilities(AbstractVisibilities):
     @classmethod
     def manual_1d(cls, visibilities):
 
-        visibilities = np.asarray(visibilities)
+        if type(visibilities) is list:
+            visibilities = np.asarray(visibilities)
 
         return Visibilities(visibilities_1d=visibilities)
 

test_autoarray/unit/mask/test_mapping.py

@@ -659,6 +659,32 @@ def test__resized_mask__trim__compare_to_manual_mask(self):
 
         assert (mask_resized == mask_resized_manual).all()
 
+    def test__rescaled_mask_from_rescale_factor__compare_to_manual_mask(self):
+
+        mask = aa.mask.unmasked(shape_2d=(5, 5))
+        mask[2, 2] = True
+
+        mask_rescaled = mask.mapping.rescaled_mask_from_rescale_factor(rescale_factor=2.0)
+
+        mask_rescaled_manual = np.full(fill_value=False, shape=(3, 3))
+        mask_rescaled_manual[1, 1] = True
+
+        mask_rescaled_manual = aa.util.mask.rescaled_mask_2d_from_mask_2d_and_rescale_factor(
+            mask_2d=mask, rescale_factor=2.0
+        )
+
+        assert (mask_rescaled == mask_rescaled_manual).all()
+
+    def test__edged_buffed_mask__compare_to_manual_mask(self):
+
+        mask = aa.mask.unmasked(shape_2d=(5, 5))
+        mask[2, 2] = True
+
+        edge_buffed_mask_manual = aa.util.mask.edge_buffed_mask_2d_from_mask_2d(mask_2d=mask).astype(
+            "bool"
+        )
+
+        assert (mask.mapping.edge_buffed_mask == edge_buffed_mask_manual).all()
 
 class TestBinnedMask: