kiloparcsec units now rounded before becoing xy ticks

Jammy2211 · Jammy2211 · commit db35f19d72a6 · 2019-11-25T11:48:51.000Z
diff --git a/autoarray/mask/mask.py b/autoarray/mask/mask.py
@@ -105,7 +105,7 @@ def unmasked(
     def circular(
         cls,
         shape_2d,
-        radius_scaled,
+        radius,
         pixel_scales,
         sub_size=1,
         origin=(0.0, 0.0),
@@ -120,7 +120,7 @@ def circular(
             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.
-        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.
@@ -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_scaled,
+            radius_scaled=radius,
             centre=centre,
         )
 
@@ -149,8 +149,8 @@ def circular(
     def circular_annular(
         cls,
         shape_2d,
-        inner_radius_scaled,
-        outer_radius_scaled,
+        inner_radius,
+        outer_radius,
         pixel_scales,
         sub_size=1,
         origin=(0.0, 0.0),
@@ -166,9 +166,9 @@ def circular_annular(
             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.
@@ -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_scaled,
-            outer_radius_scaled=outer_radius_scaled,
+            inner_radius_scaled=inner_radius,
+            outer_radius_scaled=outer_radius,
             centre=centre,
         )
 
@@ -198,9 +198,9 @@ def circular_annular(
     def circular_anti_annular(
         cls,
         shape_2d,
-        inner_radius_scaled,
-        outer_radius_scaled,
-        outer_radius_2_scaled,
+        inner_radius,
+        outer_radius,
+        outer_radius_2,
         pixel_scales,
         sub_size=1,
         origin=(0.0, 0.0),
@@ -219,12 +219,12 @@ def circular_anti_annular(
             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 inside 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 masked and outside of which they \
             are unmasked.
-        outer_radius_2_scaled : float
+        outer_radius_2 : float
             The radius (in arc seconds) of the second outer circle within which pixels are unmasked and outside of \
             which they masked.
         centre: (float, float)
@@ -238,9 +238,9 @@ 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_scaled,
-            outer_radius_scaled=outer_radius_scaled,
-            outer_radius_2_scaled=outer_radius_2_scaled,
+            inner_radius_scaled=inner_radius,
+            outer_radius_scaled=outer_radius,
+            outer_radius_2_scaled=outer_radius_2,
             centre=centre,
         )
 
@@ -256,7 +256,7 @@ def circular_anti_annular(
     def elliptical(
         cls,
         shape_2d,
-        major_axis_radius_scaled,
+        major_axis_radius,
         axis_ratio,
         phi,
         pixel_scales,
@@ -273,7 +273,7 @@ def elliptical(
             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.
@@ -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_scaled,
+            major_axis_radius_scaled=major_axis_radius,
             axis_ratio=axis_ratio,
             phi=phi,
             centre=centre,
@@ -309,10 +309,10 @@ def elliptical(
     def elliptical_annular(
         cls,
         shape_2d,
-        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,
         pixel_scales,
@@ -330,14 +330,14 @@ def elliptical_annular(
             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.
@@ -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_scaled,
+            inner_major_axis_radius_scaled=inner_major_axis_radius,
             inner_axis_ratio=inner_axis_ratio,
             inner_phi=inner_phi,
-            outer_major_axis_radius_scaled=outer_major_axis_radius_scaled,
+            outer_major_axis_radius_scaled=outer_major_axis_radius,
             outer_axis_ratio=outer_axis_ratio,
             outer_phi=outer_phi,
             centre=centre,
diff --git a/test_autoarray/plotting/array_and_mask/array_and_mask.py b/test_autoarray/plotting/array_and_mask/array_and_mask.py
@@ -6,7 +6,7 @@
 mask = aa.mask.circular(
     shape_2d=array.shape_2d,
     pixel_scales=array.pixel_scales,
-    radius_scaled=3.0,
+    radius=3.0,
     centre=(2.0, 2.0),
 )
 
diff --git a/test_autoarray/plotting/array_and_mask/array_mask_and_zoom_circular_mask.py b/test_autoarray/plotting/array_and_mask/array_mask_and_zoom_circular_mask.py
@@ -14,7 +14,7 @@
 mask = al.mask.circular(
     shape=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    radius_scaled=5.0,
+    radius=5.0,
     centre=(0.0, 0.0),
 )
 al.plot.array(array=array, mask=mask, positions=[[[1.0, 1.0]]], centres=[[(0.0, 0.0)]])
@@ -27,7 +27,7 @@
 mask = al.mask.circular(
     shape=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    radius_scaled=5.0,
+    radius=5.0,
     centre=(1.0, 1.0),
 )
 al.plot.array(array=array, mask=mask, positions=[[[2.0, 2.0]]], centres=[[(1.0, 1.0)]])
diff --git a/test_autoarray/plotting/array_and_mask/array_mask_and_zoom_elliptical_mask.py b/test_autoarray/plotting/array_and_mask/array_mask_and_zoom_elliptical_mask.py
@@ -14,7 +14,7 @@
 mask = al.mask.elliptical(
     shape=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    major_axis_radius_scaled=6.0,
+    major_axis_radius=6.0,
     axis_ratio=0.5,
     phi=0.0,
     centre=(0.0, 0.0),
@@ -29,7 +29,7 @@
 mask = al.mask.elliptical(
     shape=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    major_axis_radius_scaled=6.0,
+    major_axis_radius=6.0,
     axis_ratio=0.5,
     phi=0.0,
     centre=(1.0, 1.0),
diff --git a/test_autoarray/plotting/lens_fit.py b/test_autoarray/plotting/lens_fit.py
@@ -10,7 +10,7 @@
     data_type="lens_light_dev_vaucouleurs", data_resolution="lsst"
 )
 mask = al.mask.circular(
-    shape=imaging.shape, pixel_scales=imaging.pixel_scales, radius_scaled=3.0
+    shape=imaging.shape, pixel_scales=imaging.pixel_scales, radius=3.0
 )
 
 # The lines of code below do everything we're used to, that is, setup an image and its grid, mask it, trace it
diff --git a/test_autoarray/plotting/rectangular_arrays_inversion.py b/test_autoarray/plotting/rectangular_arrays_inversion.py
@@ -12,7 +12,7 @@
 mask = al.mask.elliptical(
     shape_2d=imaging.shape_2d,
     pixel_scales=imaging.pixel_scales,
-    major_axis_radius_scaled=3.0,
+    major_axis_radius=3.0,
     axis_ratio=0.5,
     phi=0.0,
     centre=(0.0, 0.0),
diff --git a/test_autoarray/plotting/rectangular_arrays_parametric.py b/test_autoarray/plotting/rectangular_arrays_parametric.py
@@ -12,7 +12,7 @@
 mask = al.mask.elliptical(
     shape=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    major_axis_radius_scaled=3.0,
+    major_axis_radius=3.0,
     axis_ratio=0.5,
     phi=0.0,
     centre=(0.0, 0.0),
diff --git a/test_autoarray/plotting/square_arrays.py b/test_autoarray/plotting/square_arrays.py
@@ -12,7 +12,7 @@
 mask = al.mask.elliptical(
     shape=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    major_axis_radius_scaled=3.0,
+    major_axis_radius=3.0,
     axis_ratio=1.0,
     phi=0.0,
     centre=(0.0, 0.0),
diff --git a/test_autoarray/plotting/zoom_around_mask_with_offset_mask.py b/test_autoarray/plotting/zoom_around_mask_with_offset_mask.py
@@ -12,7 +12,7 @@
 mask = al.mask.circular(
     shape_2d=imaging.shape,
     pixel_scales=imaging.pixel_scales,
-    radius_scaled=3.0,
+    radius=3.0,
     centre=(4.0, 4.0),
 )
 
diff --git a/test_autoarray/plotting/zoom_around_mask_with_offset_mask_inversion.py b/test_autoarray/plotting/zoom_around_mask_with_offset_mask_inversion.py
@@ -11,7 +11,7 @@ def fit_with_offset_centre(centre):
     mask = al.mask.elliptical(
         shape_2d=imaging.shape_2d,
         pixel_scales=imaging.pixel_scales,
-        major_axis_radius_scaled=3.0,
+        major_axis_radius=3.0,
         axis_ratio=1.0,
         phi=0.0,
         centre=centre,
diff --git a/test_autoarray/unit/mask/test_mask.py b/test_autoarray/unit/mask/test_mask.py
@@ -183,7 +183,7 @@ def test__mask_circular__compare_to_array_util(self):
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            radius_scaled=3.5,
+            radius=3.5,
             centre=(0.0, 0.0),
         )
 
@@ -203,7 +203,7 @@ def test__mask_circular__inverted__compare_to_array_util(self):
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            radius_scaled=3.5,
+            radius=3.5,
             centre=(0.0, 0.0),
             invert=True,
         )
@@ -227,8 +227,8 @@ def test__mask_annulus__compare_to_array_util(self):
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=3.5,
+            inner_radius=0.8,
+            outer_radius=3.5,
             centre=(0.0, 0.0),
         )
 
@@ -249,8 +249,8 @@ def test__mask_annulus_inverted__compare_to_array_util(self):
             shape_2d=(5, 4),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=3.5,
+            inner_radius=0.8,
+            outer_radius=3.5,
             centre=(0.0, 0.0),
             invert=True,
         )
@@ -275,9 +275,9 @@ def test__mask_anti_annulus__compare_to_array_util(self):
             shape_2d=(9, 9),
             pixel_scales=(1.2, 1.2),
             sub_size=1,
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=2.2,
-            outer_radius_2_scaled=3.0,
+            inner_radius=0.8,
+            outer_radius=2.2,
+            outer_radius_2=3.0,
             centre=(0.0, 0.0),
         )
 
@@ -299,9 +299,9 @@ def test__mask_anti_annulus_inverted__compare_to_array_util(self):
             shape_2d=(9, 9),
             pixel_scales=(1.2, 1.2),
             sub_size=1,
-            inner_radius_scaled=0.8,
-            outer_radius_scaled=2.2,
-            outer_radius_2_scaled=3.0,
+            inner_radius=0.8,
+            outer_radius=2.2,
+            outer_radius_2=3.0,
             centre=(0.0, 0.0),
             invert=True,
         )
@@ -326,7 +326,7 @@ def test__mask_elliptical__compare_to_array_util(self):
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            major_axis_radius_scaled=5.7,
+            major_axis_radius=5.7,
             axis_ratio=0.4,
             phi=40.0,
             centre=(0.0, 0.0),
@@ -350,7 +350,7 @@ def test__mask_elliptical_inverted__compare_to_array_util(self):
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            major_axis_radius_scaled=5.7,
+            major_axis_radius=5.7,
             axis_ratio=0.4,
             phi=40.0,
             centre=(0.0, 0.0),
@@ -380,10 +380,10 @@ def test__mask_elliptical_annular__compare_to_array_util(self):
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            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),
@@ -411,10 +411,10 @@ def test__mask_elliptical_annular_inverted__compare_to_array_util(self):
             shape_2d=(8, 5),
             pixel_scales=(2.7, 2.7),
             sub_size=1,
-            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),
diff --git a/test_autoarray/unit/operators/test_convolver.py b/test_autoarray/unit/operators/test_convolver.py
@@ -1184,7 +1184,7 @@ def test__compare_convolver_to_2d_convolution(self):
         blurred_image = aa.array.manual_2d(array=blurred_image)
 
         mask = aa.mask.circular(
-            shape_2d=(30, 30), pixel_scales=(1.0, 1.0), sub_size=1, radius_scaled=4.0
+            shape_2d=(30, 30), pixel_scales=(1.0, 1.0), sub_size=1, radius=4.0
         )
 
         masked_image = mask.mapping.array_from_array_2d(array_2d=image.in_2d)
diff --git a/test_autoarray/unit/plotters/test_mapper_plotters.py b/test_autoarray/unit/plotters/test_mapper_plotters.py
@@ -23,7 +23,7 @@ def make_image():
 
 @pytest.fixture(name="mask")
 def make_mask():
-    return aa.mask.circular(shape_2d=((3, 3)), pixel_scales=0.1, radius_scaled=0.1)
+    return aa.mask.circular(shape_2d=((3, 3)), pixel_scales=0.1, radius=0.1)
 
 
 @pytest.fixture(name="grid")
diff --git a/test_autoarray/unit/structures/test_grids.py b/test_autoarray/unit/structures/test_grids.py

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`mask = aa.mask.circular(`
`7`	`7`	`shape_2d=array.shape_2d,`
`8`	`8`	`pixel_scales=array.pixel_scales,`
`9`		`- radius_scaled=3.0,`
	`9`	`+ radius=3.0,`
`10`	`10`	`centre=(2.0, 2.0),`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`data_type="lens_light_dev_vaucouleurs", data_resolution="lsst"`
`11`	`11`	`)`
`12`	`12`	`mask = al.mask.circular(`
`13`		`- shape=imaging.shape, pixel_scales=imaging.pixel_scales, radius_scaled=3.0`
	`13`	`+ shape=imaging.shape, pixel_scales=imaging.pixel_scales, radius=3.0`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`# The lines of code below do everything we're used to, that is, setup an image and its grid, mask it, trace it`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`mask = al.mask.circular(`
`13`	`13`	`shape_2d=imaging.shape,`
`14`	`14`	`pixel_scales=imaging.pixel_scales,`
`15`		`- radius_scaled=3.0,`
	`15`	`+ radius=3.0,`
`16`	`16`	`centre=(4.0, 4.0),`
`17`	`17`	`)`
`18`	`18`