Merge branch 'main' of https://github.com/sunpy/ndcube into crop_inputs_order

Author: DanRyanIrish

changelog/863.bugfix.rst

@@ -0,0 +1 @@
+Enable length-1 inputs to `ndcube.NDCube.crop`, not only scalars.

ndcube/ndcube.py

@@ -709,7 +709,7 @@ def crop_by_values_input_units_order(self):
         crop_by_values() also accepts equivalent units so long as they are
         in the same order as returned here.
         """
-        return tuple(self.wcs.world_axis_unit)
+        return tuple(self.wcs.world_axis_units)
 
     def __str__(self):
         return textwrap.dedent(f"""\

ndcube/tests/test_ndcube_reproject_and_rebin.py

@@ -4,7 +4,11 @@
 import dask.array
 import numpy as np
 import pytest
-from specutils import Spectrum
+
+try:
+    from specutils import Spectrum
+except ImportError:
+    from specutils import Spectrum1D as Spectrum
 
 import astropy.units as u
 import astropy.wcs

ndcube/tests/test_ndcube_slice_and_crop.py

@@ -218,6 +218,16 @@ def test_crop_tuple_non_tuple_input(ndcube_2d_ln_lt):
     helpers.assert_cubes_equal(cropped_by_tuples, cropped_by_coords)
 
 
+def test_crop_length_1_input(ndcube_2d_ln_lt):
+    cube = ndcube_2d_ln_lt
+    frame = astropy.wcs.utils.wcs_to_celestial_frame(cube.wcs)
+    lower_corner = SkyCoord(Tx=[0359.99667], Ty=[-0.0011111111], unit="deg", frame=frame)
+    upper_corner = SkyCoord(Tx=[[0.0044444444]], Ty=[[0.0011111111]], unit="deg", frame=frame)
+    cropped_by_shaped = cube.crop(lower_corner, upper_corner)
+    cropped_by_scalars = cube.crop((lower_corner.squeeze(),), (upper_corner.squeeze(),))
+    helpers.assert_cubes_equal(cropped_by_shaped, cropped_by_scalars)
+
+
 def test_crop_with_nones(ndcube_4d_ln_lt_l_t):
     cube = ndcube_4d_ln_lt_l_t
     lower_corner = [None] * 3

ndcube/utils/cube.py

@@ -5,7 +5,7 @@
 import numpy as np
 
 import astropy.nddata
-from astropy.wcs.wcsapi import BaseHighLevelWCS, HighLevelWCSWrapper, SlicedLowLevelWCS
+from astropy.wcs.wcsapi import BaseHighLevelWCS, BaseLowLevelWCS, HighLevelWCSWrapper, SlicedLowLevelWCS
 
 from ndcube.utils import wcs as wcs_utils
 
@@ -81,6 +81,8 @@ def sanitize_crop_inputs(points, wcs):
         # Confirm whether point contains at least one None entry.
         if all(coord is None for coord in points[i]):
             values_are_none[i] = True
+        # Squeeze length-1 coordinate objects to scalars.
+        points[i] = [coord.squeeze() if hasattr(coord, "squeeze") else coord for coord in points[i]]
     # If no points contain a coord, i.e. if all entries in all points are None,
     # set no-op flag to True and exit.
     if all(values_are_none):
@@ -138,6 +140,8 @@ def get_crop_item_from_points(points, wcs, crop_by_values, keepdims):
     # Define a list of lists to hold the array indices of the points
     # where each inner list gives the index of all points for that array axis.
     combined_points_array_idx = [[]] * wcs.pixel_n_dim
+    high_level_wcs = HighLevelWCSWrapper(wcs) if isinstance(wcs, BaseLowLevelWCS) else wcs
+    wcs = high_level_wcs.low_level_wcs
     # For each point compute the corresponding array indices.
     for point in points:
         # Get the arrays axes associated with each element in point.
@@ -150,8 +154,7 @@ def get_crop_item_from_points(points, wcs, crop_by_values, keepdims):
                     wcs_utils.convert_between_array_and_pixel_axes(pix_axes, wcs.pixel_n_dim)))
             point_inputs_array_axes = tuple(point_inputs_array_axes)
         else:
-            point_inputs_array_axes = wcs_utils.array_indices_for_world_objects(
-                HighLevelWCSWrapper(wcs))
+            point_inputs_array_axes = wcs_utils.array_indices_for_world_objects(high_level_wcs)
         # Get indices of array axes which correspond to only None inputs in point
         # as well as those that correspond to a coord.
         point_indices_with_inputs = []