- Changed all radius scaled to radius

Merge branch 'release/0.3.3'

Author: Jammy2211

autoarray/__init__.py

@@ -25,4 +25,4 @@
 from autoarray.structures.kernel import Kernel as kernel
 from autoarray.structures.visibilities import Visibilities as visibilities
 
-__version__ = '0.3.2'
+__version__ = '0.3.3'

autoarray/mask/mask.py

@@ -133,7 +133,7 @@ def circular(
         mask_2d = mask_util.mask_2d_circular_from_shape_2d_pixel_scales_and_radius(
             shape_2d=shape_2d,
             pixel_scales=pixel_scales,
-            radius_scaled=radius,
+            radius=radius,
             centre=centre,
         )
 
@@ -181,8 +181,8 @@ def circular_annular(
         mask_2d = mask_util.mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
             shape_2d=shape_2d,
             pixel_scales=pixel_scales,
-            inner_radius_scaled=inner_radius,
-            outer_radius_scaled=outer_radius,
+            inner_radius=inner_radius,
+            outer_radius=outer_radius,
             centre=centre,
         )
 
@@ -238,8 +238,8 @@ def circular_anti_annular(
         mask_2d = mask_util.mask_2d_circular_anti_annular_from_shape_2d_pixel_scales_and_radii(
             shape_2d=shape_2d,
             pixel_scales=pixel_scales,
-            inner_radius_scaled=inner_radius,
-            outer_radius_scaled=outer_radius,
+            inner_radius=inner_radius,
+            outer_radius=outer_radius,
             outer_radius_2_scaled=outer_radius_2,
             centre=centre,
         )
@@ -291,7 +291,7 @@ def elliptical(
         mask_2d = mask_util.mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
             shape_2d=shape_2d,
             pixel_scales=pixel_scales,
-            major_axis_radius_scaled=major_axis_radius,
+            major_axis_radius=major_axis_radius,
             axis_ratio=axis_ratio,
             phi=phi,
             centre=centre,
@@ -355,10 +355,10 @@ def elliptical_annular(
         mask_2d = mask_util.mask_2d_elliptical_annular_from_shape_2d_pixel_scales_and_radius(
             shape_2d=shape_2d,
             pixel_scales=pixel_scales,
-            inner_major_axis_radius_scaled=inner_major_axis_radius,
+            inner_major_axis_radius=inner_major_axis_radius,
             inner_axis_ratio=inner_axis_ratio,
             inner_phi=inner_phi,
-            outer_major_axis_radius_scaled=outer_major_axis_radius,
+            outer_major_axis_radius=outer_major_axis_radius,
             outer_axis_ratio=outer_axis_ratio,
             outer_phi=outer_phi,
             centre=centre,

autoarray/util/mask_util.py

@@ -129,7 +129,7 @@ def total_sparse_pixels_from_mask_2d(mask_2d, unmasked_sparse_grid_pixel_centres
 
 @decorator_util.jit()
 def mask_2d_circular_from_shape_2d_pixel_scales_and_radius(
-    shape_2d, pixel_scales, radius_scaled, centre=(0.0, 0.0)
+    shape_2d, pixel_scales, radius, centre=(0.0, 0.0)
 ):
     """Compute a circular mask from the 2D mask array shape and radius of the circle.
 
@@ -141,7 +141,7 @@ def mask_2d_circular_from_shape_2d_pixel_scales_and_radius(
         The (y,x) shape of the mask in unit_label of pixels.
     pixel_scales: float
         The arc-second to pixel conversion factor of each pixel.
-    radius_scaled : float
+    radius : float
         The radius (in arc seconds) of the circle within which pixels unmasked.
     centre: (float, float)
         The centre of the circle used to mask pixels.
@@ -171,15 +171,15 @@ def mask_2d_circular_from_shape_2d_pixel_scales_and_radius(
 
             r_arcsec = np.sqrt(x_arcsec ** 2 + y_arcsec ** 2)
 
-            if r_arcsec <= radius_scaled:
+            if r_arcsec <= radius:
                 mask[y, x] = False
 
     return mask
 
 
 @decorator_util.jit()
 def mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
-    shape_2d, pixel_scales, inner_radius_scaled, outer_radius_scaled, centre=(0.0, 0.0)
+    shape_2d, pixel_scales, inner_radius, outer_radius, centre=(0.0, 0.0)
 ):
     """Compute an annular mask from an input inner and outer mask radius and shape.
 
@@ -191,9 +191,9 @@ def mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
         The (y,x) shape of the mask in unit_label of pixels.
     pixel_scales : (float, float)
         The arc-second to pixel conversion factor of each pixel.
-    inner_radius_scaled : float
+    inner_radius : float
         The radius (in arc seconds) of the inner circle outside of which pixels are unmasked.
-    outer_radius_scaled : float
+    outer_radius : float
         The radius (in arc seconds) of the outer circle within which pixels are unmasked.
     centre: (float, float)
         The centre of the annulus used to mask pixels.
@@ -223,7 +223,7 @@ def mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
 
             r_arcsec = np.sqrt(x_arcsec ** 2 + y_arcsec ** 2)
 
-            if outer_radius_scaled >= r_arcsec >= inner_radius_scaled:
+            if outer_radius >= r_arcsec >= inner_radius:
                 mask[y, x] = False
 
     return mask
@@ -233,8 +233,8 @@ def mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
 def mask_2d_circular_anti_annular_from_shape_2d_pixel_scales_and_radii(
     shape_2d,
     pixel_scales,
-    inner_radius_scaled,
-    outer_radius_scaled,
+    inner_radius,
+    outer_radius,
     outer_radius_2_scaled,
     centre=(0.0, 0.0),
 ):
@@ -255,8 +255,8 @@ def mask_2d_circular_anti_annular_from_shape_2d_pixel_scales_and_radii(
             r_arcsec = np.sqrt(x_arcsec ** 2 + y_arcsec ** 2)
 
             if (
-                inner_radius_scaled >= r_arcsec
-                or outer_radius_2_scaled >= r_arcsec >= outer_radius_scaled
+                inner_radius >= r_arcsec
+                or outer_radius_2_scaled >= r_arcsec >= outer_radius
             ):
                 mask[y, x] = False
 
@@ -279,7 +279,7 @@ def elliptical_radius_from_y_x_phi_and_axis_ratio(y_arcsec, x_arcsec, phi, axis_
 
 @decorator_util.jit()
 def mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
-    shape_2d, pixel_scales, major_axis_radius_scaled, axis_ratio, phi, centre=(0.0, 0.0)
+    shape_2d, pixel_scales, major_axis_radius, axis_ratio, phi, centre=(0.0, 0.0)
 ):
     """Compute an elliptical mask from an input major-axis mask radius, axis-ratio, rotational angle phi, shape and \
     centre.
@@ -292,7 +292,7 @@ def mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
         The (y,x) shape of the mask in unit_label of pixels.
     pixel_scales : (float, float)
         The arc-second to pixel conversion factor of each pixel.
-    major_axis_radius_scaled : float
+    major_axis_radius : float
         The major-axis (in arc seconds) of the ellipse within which pixels are unmasked.
     axis_ratio : float
         The axis-ratio of the ellipse within which pixels are unmasked.
@@ -329,7 +329,7 @@ def mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
                 y_arcsec, x_arcsec, phi, axis_ratio
             )
 
-            if r_arcsec_elliptical <= major_axis_radius_scaled:
+            if r_arcsec_elliptical <= major_axis_radius:
                 mask[y, x] = False
 
     return mask
@@ -339,10 +339,10 @@ def mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
 def mask_2d_elliptical_annular_from_shape_2d_pixel_scales_and_radius(
     shape_2d,
     pixel_scales,
-    inner_major_axis_radius_scaled,
+    inner_major_axis_radius,
     inner_axis_ratio,
     inner_phi,
-    outer_major_axis_radius_scaled,
+    outer_major_axis_radius,
     outer_axis_ratio,
     outer_phi,
     centre=(0.0, 0.0),
@@ -358,14 +358,14 @@ def mask_2d_elliptical_annular_from_shape_2d_pixel_scales_and_radius(
         The (y,x) shape of the mask in unit_label of pixels.
     pixel_scales : (float, float)
         The arc-second to pixel conversion factor of each pixel.
-    inner_major_axis_radius_scaled : float
+    inner_major_axis_radius : float
         The major-axis (in arc seconds) of the inner ellipse within which pixels are masked.
     inner_axis_ratio : float
         The axis-ratio of the inner ellipse within which pixels are masked.
     inner_phi : float
         The rotation angle of the inner ellipse within which pixels are masked, (counter-clockwise from the \
         positive x-axis).
-    outer_major_axis_radius_scaled : float
+    outer_major_axis_radius : float
         The major-axis (in arc seconds) of the outer ellipse within which pixels are unmasked.
     outer_axis_ratio : float
         The axis-ratio of the outer ellipse within which pixels are unmasked.
@@ -410,8 +410,8 @@ def mask_2d_elliptical_annular_from_shape_2d_pixel_scales_and_radius(
             )
 
             if (
-                inner_r_arcsec_elliptical >= inner_major_axis_radius_scaled
-                and outer_r_arcsec_elliptical <= outer_major_axis_radius_scaled
+                inner_r_arcsec_elliptical >= inner_major_axis_radius
+                and outer_r_arcsec_elliptical <= outer_major_axis_radius
             ):
                 mask[y, x] = False
 

test_autoarray/unit/mask/test_mask.py

@@ -175,7 +175,7 @@ def test__mask_circular__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_circular_from_shape_2d_pixel_scales_and_radius(
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
-            radius_scaled=3.5,
+            radius=3.5,
             centre=(0.0, 0.0),
         )
 
@@ -195,7 +195,7 @@ def test__mask_circular__inverted__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_circular_from_shape_2d_pixel_scales_and_radius(
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
-            radius_scaled=3.5,
+            radius=3.5,
             centre=(0.0, 0.0),
         )
 
@@ -218,8 +218,8 @@ def test__mask_annulus__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=3.5,
+            inner_radius=0.8,
+            outer_radius=3.5,
             centre=(0.0, 0.0),
         )
 
@@ -240,8 +240,8 @@ def test__mask_annulus_inverted__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_circular_annular_from_shape_2d_pixel_scales_and_radii(
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=3.5,
+            inner_radius=0.8,
+            outer_radius=3.5,
             centre=(0.0, 0.0),
         )
 
@@ -265,8 +265,8 @@ def test__mask_anti_annulus__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_circular_anti_annular_from_shape_2d_pixel_scales_and_radii(
             shape_2d=(9, 9),
             pixel_scales=(1.2, 1.2),
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=2.2,
+            inner_radius=0.8,
+            outer_radius=2.2,
             outer_radius_2_scaled=3.0,
             centre=(0.0, 0.0),
         )
@@ -289,8 +289,8 @@ def test__mask_anti_annulus_inverted__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_circular_anti_annular_from_shape_2d_pixel_scales_and_radii(
             shape_2d=(9, 9),
             pixel_scales=(1.2, 1.2),
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=2.2,
+            inner_radius=0.8,
+            outer_radius=2.2,
             outer_radius_2_scaled=3.0,
             centre=(0.0, 0.0),
         )
@@ -316,7 +316,7 @@ def test__mask_elliptical__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
-            major_axis_radius_scaled=5.7,
+            major_axis_radius=5.7,
             axis_ratio=0.4,
             phi=40.0,
             centre=(0.0, 0.0),
@@ -340,7 +340,7 @@ def test__mask_elliptical_inverted__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_elliptical_from_shape_2d_pixel_scales_and_radius(
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
-            major_axis_radius_scaled=5.7,
+            major_axis_radius=5.7,
             axis_ratio=0.4,
             phi=40.0,
             centre=(0.0, 0.0),
@@ -367,10 +367,10 @@ def test__mask_elliptical_annular__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_elliptical_annular_from_shape_2d_pixel_scales_and_radius(
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
-            inner_major_axis_radius_scaled=2.1,
+            inner_major_axis_radius=2.1,
             inner_axis_ratio=0.6,
             inner_phi=20.0,
-            outer_major_axis_radius_scaled=5.7,
+            outer_major_axis_radius=5.7,
             outer_axis_ratio=0.4,
             outer_phi=40.0,
             centre=(0.0, 0.0),
@@ -398,10 +398,10 @@ def test__mask_elliptical_annular_inverted__compare_to_array_util(self):
         mask_via_util = aa.util.mask.mask_2d_elliptical_annular_from_shape_2d_pixel_scales_and_radius(
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
-            inner_major_axis_radius_scaled=2.1,
+            inner_major_axis_radius=2.1,
             inner_axis_ratio=0.6,
             inner_phi=20.0,
-            outer_major_axis_radius_scaled=5.7,
+            outer_major_axis_radius=5.7,
             outer_axis_ratio=0.4,
             outer_phi=40.0,
             centre=(0.0, 0.0),