ASDF Cutout Progress

Author: snbianco

astrocut/ASDFCutout.py

@@ -1,17 +1,18 @@
 from abc import abstractmethod, ABC
 from pathlib import Path
 from typing import List, Union, Tuple
+import warnings
 
 from astropy import wcs
 import astropy.units as u
 from s3path import S3Path
 from astropy.coordinates import SkyCoord
 import numpy as np
 
-from astrocut.exceptions import InvalidInputError, InvalidQueryError
+from astrocut.exceptions import InputWarning, InvalidInputError, InvalidQueryError
 
 from . import log
-from .utils.utils import _handle_verbose, parse_size_input
+from .utils.utils import _handle_verbose
 
 
 class Cutout(ABC):
@@ -60,13 +61,15 @@ def __init__(self, input_files: List[Union[str, Path, S3Path]], coordinates: Uni
         self._input_files = input_files
 
         # Get coordinates as a SkyCoord object
-        if coordinates and not isinstance(coordinates, SkyCoord):
+        if isinstance(coordinates, tuple):
+            coordinates = SkyCoord(*coordinates, unit='deg')
+        elif not isinstance(coordinates, SkyCoord):
             coordinates = SkyCoord(coordinates, unit='deg')
         self._coordinates = coordinates
         log.debug('Coordinates: %s', self._coordinates)
 
         # Turning the cutout size into an array of two values
-        self._cutout_size = parse_size_input(cutout_size)
+        self._cutout_size = self.parse_size_input(cutout_size)
         log.debug('Cutout size: %s', self._cutout_size)
 
         # Assigning other attributes
@@ -84,6 +87,54 @@ def __init__(self, input_files: List[Union[str, Path, S3Path]], coordinates: Uni
         self._output_dir = output_dir
         self._verbose = verbose
 
+    def parse_size_input(self, cutout_size):
+        """
+        Makes the given cutout size into a length 2 array.
+
+        Parameters
+        ----------
+        cutout_size : int, array-like, `~astropy.units.Quantity`
+            The size of the cutout array. If ``cutout_size`` is a scalar number or a scalar 
+            `~astropy.units.Quantity`, then a square cutout of ``cutout_size`` will be created.  
+            If ``cutout_size`` has two elements, they should be in ``(ny, nx)`` order.  Scalar numbers 
+            in ``cutout_size`` are assumed to be in units of pixels. `~astropy.units.Quantity` objects 
+            must be in pixel or angular units.
+
+        Returns
+        -------
+        response : array
+            Length two cutout size array, in the form [ny, nx].
+        """
+
+        # Making size into an array [ny, nx]
+        if np.isscalar(cutout_size):
+            cutout_size = np.repeat(cutout_size, 2)
+
+        if isinstance(cutout_size, u.Quantity):
+            cutout_size = np.atleast_1d(cutout_size)
+            if len(cutout_size) == 1:
+                cutout_size = np.repeat(cutout_size, 2)
+        elif not isinstance(cutout_size, np.ndarray):
+            cutout_size = np.array(cutout_size)
+
+        if len(cutout_size) > 2:
+            warnings.warn('Too many dimensions in cutout size, only the first two will be used.',
+                          InputWarning)
+            cutout_size = cutout_size[:2]
+
+        
+        for dim in cutout_size:
+            # Raise error if either dimension is not a positive number
+            if dim <= 0:
+                raise InvalidInputError('Cutout size dimensions must be greater than zero. '
+                                        f'Provided size: ({cutout_size[0]}, {cutout_size[1]})')
+            
+            # Raise error if either dimension is not an pixel or angular Quantity
+            if isinstance(dim, u.Quantity) and dim.unit != u.pixel and dim.unit.physical_type != 'angle':
+                raise InvalidInputError(f'Cutout size unit {dim.unit.aliases[0]} is not supported.')
+
+        return cutout_size
+
     def _get_cutout_limits(self, img_wcs: wcs.WCS) -> np.ndarray:
         """
         Returns the x and y pixel limits for the cutout.

astrocut/Cutout.py

@@ -84,12 +84,10 @@ class FITSCutout(ImageCutout):
         Cutout an image file.
     _construct_fits_from_hdus()
         Make one or more cutout HDUs into a single HDUList object.
-    _write_to_memory()
-        Write the cutouts to memory.
     _write_as_fits()
-        Write the cutouts to a file in FITS format.
+        Write the cutouts to disk or memory in FITS format.
     _write_as_asdf()
-        Write the cutouts to a file in ASDF format.
+        Write the cutouts to disk or memory in ASDF format.
     """
 
     def __init__(self, input_files: List[Union[str, Path, S3Path]], coordinates: Union[SkyCoord, str], 
@@ -461,7 +459,7 @@ def _write_as_fits(self) -> Union[str, List[str]]:
         Returns
         -------
         cutout_paths : str | list
-            The path(s) to the cutout file(s).
+            The path(s) to the cutout file(s) or the cutout memory objects.
         """
         if self._single_outfile:
             log.debug('Returning cutout as a single FITS file.')

astrocut/FITSCutout.py

@@ -102,10 +102,10 @@ def __init__(self, input_files: List[Union[str, Path, S3Path]], coordinates: Uni
         self._output_format = f'.{out_lower}' if not output_format.startswith('.') else out_lower
 
         # Warn if image processing parameters are provided for FITS output
-        if (self._output_format == '.fits') and (stretch or minmax_percent or 
-                                                 minmax_value or invert or colorize):
+        if ((self._output_format == '.fits' or self._output_format == '.asdf') and 
+           (stretch or minmax_percent or minmax_value or invert or colorize)):
             warnings.warn('Stretch, minmax_percent, minmax_value, invert, and colorize are not supported '
-                          'for FITS output and will be ignored.', InputWarning)
+                          'for FITS or ASDF output and will be ignored.', InputWarning)
 
         # Assign attributes with defaults if not provided
         stretch = stretch or 'asinh'