remove grid_2d_slim_upscaled_from

Author: Jammy2211

autoarray/structures/grids/grid_2d_util.py

@@ -738,58 +738,6 @@ def grid_2d_native_from(
     return jnp.stack((grid_2d_native_y, grid_2d_native_x), axis=-1)
 
 
-@numba_util.jit()
-def grid_2d_slim_upscaled_from(
-    grid_slim: np.ndarray, upscale_factor: int, pixel_scales: ty.PixelScales
-) -> np.ndarray:
-    """
-    From an input slimmed 2D grid, return an upscaled slimmed 2D grid where (y,x) coordinates are added at an
-    upscaled resolution to each grid coordinate.
-
-    Parameters
-    ----------
-    grid_slim
-        The slimmed grid of (y,x) coordinates over which a square uniform grid is overlaid.
-    upscale_factor
-        The upscaled resolution at which the new grid coordinates are computed.
-    pixel_scales
-        The pixel scale of the uniform grid that laid over the irregular grid of (y,x) coordinates.
-    """
-
-    grid_2d_slim_upscaled = np.zeros(shape=(grid_slim.shape[0] * upscale_factor**2, 2))
-
-    upscale_index = 0
-
-    y_upscale_half = pixel_scales[0] / 2
-    y_upscale_step = pixel_scales[0] / upscale_factor
-
-    x_upscale_half = pixel_scales[1] / 2
-    x_upscale_step = pixel_scales[1] / upscale_factor
-
-    for slim_index in range(grid_slim.shape[0]):
-        y_grid = grid_slim[slim_index, 0]
-        x_grid = grid_slim[slim_index, 1]
-
-        for y in range(upscale_factor):
-            for x in range(upscale_factor):
-                grid_2d_slim_upscaled[upscale_index, 0] = (
-                    y_grid
-                    + y_upscale_half
-                    - y * y_upscale_step
-                    - (y_upscale_step / 2.0)
-                )
-                grid_2d_slim_upscaled[upscale_index, 1] = (
-                    x_grid
-                    - x_upscale_half
-                    + x * x_upscale_step
-                    + (x_upscale_step / 2.0)
-                )
-
-                upscale_index += 1
-
-    return grid_2d_slim_upscaled
-
-
 def grid_2d_of_points_within_radius(
     radius: float, centre: Tuple[float, float], grid_2d: np.ndarray
 ):

test_autoarray/structures/grids/test_grid_2d_util.py

@@ -460,108 +460,4 @@ def test__grid_2d_native_from():
                 [[-1.0, -1.0], [-2.0, -2.0], [0.0, 0.0], [-3.0, -3.0]],
             ]
         )
-    ).all()
-
-    grid_slim = np.array(
-        [
-            [1.0, 1.0],
-            [1.0, 1.0],
-            [1.0, 1.0],
-            [1.0, 1.0],
-            [2.0, 2.0],
-            [2.0, 2.0],
-            [2.0, 2.0],
-            [2.0, 2.0],
-            [3.0, 3.0],
-            [3.0, 3.0],
-            [3.0, 3.0],
-            [4.0, 4.0],
-        ]
-    )
-
-
-def test__grid_2d_slim_upscaled_from():
-    grid_slim = np.array([[1.0, 1.0]])
-
-    grid_upscaled_2d = aa.util.grid_2d.grid_2d_slim_upscaled_from(
-        grid_slim=grid_slim, upscale_factor=1, pixel_scales=(2.0, 2.0)
-    )
-
-    assert (grid_upscaled_2d == np.array([[1.0, 1.0]])).all()
-
-    grid_upscaled_2d = aa.util.grid_2d.grid_2d_slim_upscaled_from(
-        grid_slim=grid_slim, upscale_factor=2, pixel_scales=(2.0, 2.0)
-    )
-
-    assert (
-        grid_upscaled_2d == np.array([[1.5, 0.5], [1.5, 1.5], [0.5, 0.5], [0.5, 1.5]])
-    ).all()
-
-    grid_slim = np.array([[1.0, 1.0], [1.0, 3.0]])
-
-    grid_upscaled_2d = aa.util.grid_2d.grid_2d_slim_upscaled_from(
-        grid_slim=grid_slim, upscale_factor=2, pixel_scales=(2.0, 2.0)
-    )
-
-    assert (
-        grid_upscaled_2d
-        == np.array(
-            [
-                [1.5, 0.5],
-                [1.5, 1.5],
-                [0.5, 0.5],
-                [0.5, 1.5],
-                [1.5, 2.5],
-                [1.5, 3.5],
-                [0.5, 2.5],
-                [0.5, 3.5],
-            ]
-        )
-    ).all()
-
-    grid_slim = np.array([[1.0, 1.0], [3.0, 1.0]])
-
-    grid_upscaled_2d = aa.util.grid_2d.grid_2d_slim_upscaled_from(
-        grid_slim=grid_slim, upscale_factor=2, pixel_scales=(2.0, 2.0)
-    )
-
-    assert (
-        grid_upscaled_2d
-        == np.array(
-            [
-                [1.5, 0.5],
-                [1.5, 1.5],
-                [0.5, 0.5],
-                [0.5, 1.5],
-                [3.5, 0.5],
-                [3.5, 1.5],
-                [2.5, 0.5],
-                [2.5, 1.5],
-            ]
-        )
-    ).all()
-
-    grid_slim = np.array([[1.0, 1.0]])
-
-    grid_upscaled_2d = aa.util.grid_2d.grid_2d_slim_upscaled_from(
-        grid_slim=grid_slim, upscale_factor=2, pixel_scales=(3.0, 2.0)
-    )
-
-    assert (
-        grid_upscaled_2d
-        == np.array([[1.75, 0.5], [1.75, 1.5], [0.25, 0.5], [0.25, 1.5]])
-    ).all()
-
-    grid_upscaled_2d = aa.util.grid_2d.grid_2d_slim_upscaled_from(
-        grid_slim=grid_slim, upscale_factor=3, pixel_scales=(2.0, 2.0)
-    )
-
-    assert grid_upscaled_2d[0] == pytest.approx(np.array([1.666, 0.333]), 1.0e-2)
-    assert grid_upscaled_2d[1] == pytest.approx(np.array([1.666, 1.0]), 1.0e-2)
-    assert grid_upscaled_2d[2] == pytest.approx(np.array([1.666, 1.666]), 1.0e-2)
-    assert grid_upscaled_2d[3] == pytest.approx(np.array([1.0, 0.333]), 1.0e-2)
-    assert grid_upscaled_2d[4] == pytest.approx(np.array([1.0, 1.0]), 1.0e-2)
-    assert grid_upscaled_2d[5] == pytest.approx(np.array([1.0, 1.666]), 1.0e-2)
-    assert grid_upscaled_2d[6] == pytest.approx(np.array([0.333, 0.333]), 1.0e-2)
-    assert grid_upscaled_2d[7] == pytest.approx(np.array([0.333, 1.0]), 1.0e-2)
-    assert grid_upscaled_2d[8] == pytest.approx(np.array([0.333, 1.666]), 1.0e-2)
+    ).all()