diff --git a/src/hipscat/catalog/catalog.py b/src/hipscat/catalog/catalog.py index 2d1c18b9..423f1373 100644 --- a/src/hipscat/catalog/catalog.py +++ b/src/hipscat/catalog/catalog.py @@ -20,9 +20,9 @@ filter_pixels_by_polygon, ) from hipscat.pixel_math.validators import ( + validate_box_search, validate_declination_values, validate_polygon, - validate_radec_search, validate_radius, ) @@ -95,7 +95,7 @@ def filter_by_box( Returns: A new catalog with only the pixels that overlap with the specified region """ - validate_radec_search(ra, dec) + validate_box_search(ra, dec) ra, dec = transform_radec(ra, dec) if ra is not None and dec is not None: vertices = form_polygon(ra, dec) diff --git a/src/hipscat/pixel_math/box_filter.py b/src/hipscat/pixel_math/box_filter.py index 70e5a34a..4dfa8a21 100644 --- a/src/hipscat/pixel_math/box_filter.py +++ b/src/hipscat/pixel_math/box_filter.py @@ -10,7 +10,7 @@ from hipscat.pixel_math import HealpixPixel from hipscat.pixel_math.filter import get_filtered_pixel_list from hipscat.pixel_math.polygon_filter import SphericalCoordinates -from hipscat.pixel_math.validators import validate_radec_search +from hipscat.pixel_math.validators import validate_box_search from hipscat.pixel_tree.pixel_tree import PixelTree from hipscat.pixel_tree.pixel_tree_builder import PixelTreeBuilder @@ -31,7 +31,7 @@ def filter_pixels_by_box( List of HealpixPixels representing only the pixels that overlap with the right ascension or the declination region. """ - validate_radec_search(ra, dec) + validate_box_search(ra, dec) max_order = pixel_tree.get_max_depth() search_tree = ( _generate_ra_strip_pixel_tree(ra, max_order) @@ -41,12 +41,12 @@ def filter_pixels_by_box( return get_filtered_pixel_list(pixel_tree, search_tree) -def transform_radec(ra, dec) -> Tuple[List[float] | None, List[float] | None]: +def transform_radec(ra, dec) -> Tuple[Tuple[float, float] | None, Tuple[float, float] | None]: """Transforms ra and dec values before performing the search. Wraps right ascension values to the [0,360] degree range and sorts declination values by ascending order.""" if ra is not None: - ra = wrap_angles(ra) + ra = tuple(wrap_angles(ra)) if dec is not None: dec = list(np.sort(dec)) return ra, dec diff --git a/src/hipscat/pixel_math/validators.py b/src/hipscat/pixel_math/validators.py index 44263052..98f2b8ad 100644 --- a/src/hipscat/pixel_math/validators.py +++ b/src/hipscat/pixel_math/validators.py @@ -87,7 +87,7 @@ def is_polygon_degenerate(vertices: np.ndarray) -> bool: return bool(np.isclose(center_distance, 0)) -def validate_radec_search(ra, dec): +def validate_box_search(ra, dec): """Checks if ra and dec values are valid for the box search. They must be pairs (of minimum and maximum value).""" values_provided = False