drizzle 2.0.0__cp313-cp313-macosx_11_0_arm64.whl → 2.1.0__cp313-cp313-macosx_11_0_arm64.whl

drizzle/tests/test_utils.py

@@ -1,11 +1,8 @@
-import os
-
 import numpy as np
 import pytest
 from numpy.testing import assert_almost_equal, assert_equal
 
-from astropy import wcs
-from astropy.io import fits
+from drizzle.tests.helpers import wcs_from_file
 from drizzle.utils import (
     _estimate_pixel_scale,
     calc_pixmap,
@@ -13,9 +10,6 @@ from drizzle.utils import (
     estimate_pixel_scale_ratio,
 )
 
-TEST_DIR = os.path.abspath(os.path.dirname(__file__))
-DATA_DIR = os.path.join(TEST_DIR, 'data')
-
 
 def test_map_rectangular():
     """
@@ -30,18 +24,17 @@ def test_map_rectangular():
     assert_equal(pixmap[5, 500], (500, 5))
 
 
-def test_map_to_self():
+@pytest.mark.parametrize(
+    "wcs_type", ["fits", "gwcs"]
+)
+def test_map_to_self(wcs_type):
     """
     Map a pixel array to itself. Should return the same array.
     """
-    input_file = os.path.join(DATA_DIR, 'input1.fits')
-    input_hdu = fits.open(input_file)
+    input_wcs = wcs_from_file("j8bt06nyq_sip_flt.fits", ext=1, wcs_type=wcs_type)
+    shape = input_wcs.array_shape
 
-    input_wcs = wcs.WCS(input_hdu[1].header)
-    naxis1, naxis2 = input_wcs.pixel_shape
-    input_hdu.close()
-
-    ok_pixmap = np.indices((naxis1, naxis2), dtype='float32')
+    ok_pixmap = np.indices(shape, dtype='float64')
     ok_pixmap = ok_pixmap.transpose()
 
     pixmap = calc_pixmap(input_wcs, input_wcs)
@@ -56,9 +49,10 @@ def test_map_to_self():
     pixmap = calc_pixmap(input_wcs, input_wcs, (12, 34))
     assert_equal(pixmap.shape, (12, 34, 2))
 
-    # Check that an exception is raised for WCS without pixel_shape or
+    # Check that an exception is raised for WCS without pixel_shape and
     # bounding_box:
     input_wcs.pixel_shape = None
+    input_wcs.bounding_box = None
     with pytest.raises(ValueError):
         calc_pixmap(input_wcs, input_wcs)
 
@@ -72,31 +66,31 @@ def test_map_to_self():
     assert_equal(pixmap.shape, (12, 34, 2))
 
     # from bounding box and pixel_shape (the later takes precedence):
-    input_wcs.pixel_shape = (naxis1, naxis2)
+    input_wcs.array_shape = shape
     pixmap = calc_pixmap(input_wcs, input_wcs)
     assert_equal(pixmap.shape, ok_pixmap.shape)
 
 
-def test_translated_map():
+@pytest.mark.parametrize(
+    "wcs_type", ["fits", "gwcs"]
+)
+def test_translated_map(wcs_type):
     """
     Map a pixel array to  at translated array.
     """
-    first_file = os.path.join(DATA_DIR, 'input1.fits')
-    first_hdu = fits.open(first_file)
-    first_header = first_hdu[1].header
-
-    first_wcs = wcs.WCS(first_header)
-    naxis1, naxis2 = first_wcs.pixel_shape
-    first_hdu.close()
-
-    second_file = os.path.join(DATA_DIR, 'input3.fits')
-    second_hdu = fits.open(second_file)
-    second_header = second_hdu[1].header
-
-    second_wcs = wcs.WCS(second_header)
-    second_hdu.close()
+    first_wcs = wcs_from_file(
+        "j8bt06nyq_sip_flt.fits",
+        ext=1,
+        wcs_type=wcs_type
+    )
+    second_wcs = wcs_from_file(
+        "j8bt06nyq_sip_flt.fits",
+        ext=1,
+        crpix_shift=(-2, -2),  # shift loaded WCS by adding this to CRPIX
+        wcs_type=wcs_type
+    )
 
-    ok_pixmap = np.indices((naxis1, naxis2), dtype='float32') - 2.0
+    ok_pixmap = np.indices(first_wcs.array_shape, dtype='float32') - 2.0
     ok_pixmap = ok_pixmap.transpose()
 
     pixmap = calc_pixmap(first_wcs, second_wcs)
@@ -104,31 +98,81 @@ def test_translated_map():
     # Got x-y transpose right
     assert_equal(pixmap.shape, ok_pixmap.shape)
     # Mapping an array to a translated array
-    assert_almost_equal(pixmap, ok_pixmap, decimal=5)
+    assert_almost_equal(pixmap[2:, 2:], ok_pixmap[2:, 2:], decimal=5)
 
 
-def test_estimate_pixel_scale_ratio():
-    input_file = os.path.join(DATA_DIR, 'j8bt06nyq_flt.fits')
+def test_disable_gwcs_bbox():
+    """
+    Map a pixel array to a translated version ofitself.
+    """
+    first_wcs = wcs_from_file(
+        "j8bt06nyq_sip_flt.fits",
+        ext=1,
+        wcs_type="gwcs"
+    )
+    second_wcs = wcs_from_file(
+        "j8bt06nyq_sip_flt.fits",
+        ext=1,
+        crpix_shift=(-2, -2),  # shift loaded WCS by adding this to CRPIX
+        wcs_type="gwcs"
+    )
 
-    with fits.open(input_file) as h:
-        w = wcs.WCS(h[1].header)
+    ok_pixmap = np.indices(first_wcs.array_shape, dtype='float64') - 2.0
+    ok_pixmap = ok_pixmap.transpose()
+
+    # Mapping an array to a translated array
+
+    # disable both bounding boxes:
+    pixmap = calc_pixmap(first_wcs, second_wcs, disable_bbox="both")
+    assert_almost_equal(pixmap[2:, 2:], ok_pixmap[2:, 2:], decimal=5)
+    assert np.all(np.isfinite(pixmap[:2, :2]))
+    assert np.all(np.isfinite(pixmap[-2:, -2:]))
+    # check bbox was restored
+    assert first_wcs.bounding_box is not None
+    assert second_wcs.bounding_box is not None
+
+    # disable "from" bounding box:
+    pixmap = calc_pixmap(second_wcs, first_wcs, disable_bbox="from")
+    assert_almost_equal(pixmap[:-2, :-2], ok_pixmap[:-2, :-2] + 4.0, decimal=5)
+    assert np.all(np.logical_not(np.isfinite(pixmap[-2:, -2:])))
+    # check bbox was restored
+    assert first_wcs.bounding_box is not None
+    assert second_wcs.bounding_box is not None
+
+    # disable "to" bounding boxes:
+    pixmap = calc_pixmap(first_wcs, second_wcs, disable_bbox="to")
+    assert_almost_equal(pixmap[2:, 2:], ok_pixmap[2:, 2:], decimal=5)
+    assert np.all(np.isfinite(pixmap[:2, :2]))
+    assert np.all(pixmap[:2, :2] < 0.0)
+    assert np.all(np.isfinite(pixmap[-2:, -2:]))
+    # check bbox was restored
+    assert first_wcs.bounding_box is not None
+    assert second_wcs.bounding_box is not None
+
+    # enable all bounding boxes:
+    pixmap = calc_pixmap(first_wcs, second_wcs, disable_bbox="none")
+    assert_almost_equal(pixmap[2:, 2:], ok_pixmap[2:, 2:], decimal=5)
+    assert np.all(np.logical_not(np.isfinite(pixmap[:2, :2])))
+    # check bbox was restored
+    assert first_wcs.bounding_box is not None
+    assert second_wcs.bounding_box is not None
 
-    pscale = estimate_pixel_scale_ratio(w, w, w.wcs.crpix, (0, 0))
 
+def test_estimate_pixel_scale_ratio():
+    w = wcs_from_file("j8bt06nyq_flt.fits", ext=1)
+    pscale = estimate_pixel_scale_ratio(w, w, w.wcs.crpix, (0, 0))
     assert abs(pscale - 0.9999999916964737) < 1.0e-9
 
 
 def test_estimate_pixel_scale_no_refpix():
     # create a WCS without higher order (polynomial) distortions:
-    fits_file = os.path.join(DATA_DIR, 'input1.fits')
-    with fits.open(fits_file) as h:
-        w = wcs.WCS(h[1].header, h)
-        w.sip = None
-        w.det2im1 = None
-        w.det2im2 = None
-        w.cpdis1 = None
-        w.cpdis2 = None
-        pixel_shape = w.pixel_shape[:]
+    w = wcs_from_file("j8bt06nyq_sip_flt.fits", ext=1)
+    w.sip = None
+    w.det2im1 = None
+    w.det2im2 = None
+    w.cpdis1 = None
+    w.cpdis2 = None
+    pixel_shape = w.pixel_shape[:]
 
     ref_pscale = _estimate_pixel_scale(w, w.wcs.crpix)
 

drizzle/utils.py

@@ -7,7 +7,7 @@ __all__ = ["calc_pixmap", "decode_context", "estimate_pixel_scale_ratio"]
 _DEG2RAD = math.pi / 180.0
 
 
-def calc_pixmap(wcs_from, wcs_to, shape=None):
+def calc_pixmap(wcs_from, wcs_to, shape=None, disable_bbox="to"):
     """
     Calculate a discretized on a grid mapping between the pixels of two images
     using provided WCS of the original ("from") image and the destination ("to")
@@ -35,6 +35,14 @@ def calc_pixmap(wcs_from, wcs_to, shape=None):
         ``numpy.ndarray`` order. When provided, it takes precedence over the
         ``wcs_from.array_shape`` property.
 
+    disable_bbox : {"to", "from", "both", "none"}, optional
+        Indicates whether to use or not to use the bounding box of either
+        (both) ``wcs_from`` or (and) ``wcs_to`` when computing pixel map. When
+        ``disable_bbox`` is "none", pixel coordinates outside of the bounding
+        box are set to `NaN` only if ``wcs_from`` or (and) ``wcs_to`` sets
+        world coordinates to NaN when input pixel coordinates are outside of
+        the bounding box.
+
     Returns
     -------
     pixmap : numpy.ndarray
@@ -57,16 +65,39 @@ def calc_pixmap(wcs_from, wcs_to, shape=None):
     If ``bounding_box`` is not available, a `ValueError` will be raised.
 
     """
+    if (bbox_from := getattr(wcs_from, "bounding_box", None)) is not None:
+        try:
+            # to avoid dependency on astropy just to check whether
+            # the bounding box is an instance of
+            # modeling.bounding_box.ModelBoundingBox, we try to
+            # directly use and bounding_box(order='F') and if it fails,
+            # fall back to converting the bounding box to a tuple
+            # (of intervals):
+            bbox_from = bbox_from.bounding_box(order='F')
+        except AttributeError:
+            bbox_from = tuple(bbox_from)
+
+    if (bbox_to := getattr(wcs_to, "bounding_box", None)) is not None:
+        try:
+            # to avoid dependency on astropy just to check whether
+            # the bounding box is an instance of
+            # modeling.bounding_box.ModelBoundingBox, we try to
+            # directly use and bounding_box(order='F') and if it fails,
+            # fall back to converting the bounding box to a tuple
+            # (of intervals):
+            bbox_to = bbox_to.bounding_box(order='F')
+        except AttributeError:
+            bbox_to = tuple(bbox_to)
+
     if shape is None:
         shape = wcs_from.array_shape
-        if shape is None:
-            if (bbox := getattr(wcs_from, "bounding_box", None)) is not None:
-                if (nd := np.ndim(bbox)) == 1:
-                    bbox = (bbox, )
-                if nd > 1:
-                    shape = tuple(
-                        int(math.ceil(lim[1] + 0.5)) for lim in bbox[::-1]
-                    )
+        if shape is None and bbox_from is not None:
+            if (nd := np.ndim(bbox_from)) == 1:
+                bbox_from = (bbox_from, )
+            if nd > 1:
+                shape = tuple(
+                    math.ceil(lim[1] + 0.5) for lim in bbox_from[::-1]
+                )
 
     if shape is None:
         raise ValueError(
@@ -74,7 +105,22 @@ def calc_pixmap(wcs_from, wcs_to, shape=None):
         )
 
     y, x = np.indices(shape, dtype=np.float64)
-    x, y = wcs_to.world_to_pixel_values(*wcs_from.pixel_to_world_values(x, y))
+
+    # temporarily disable the bounding box for the "from" WCS:
+    if disable_bbox in ["from", "both"] and bbox_from is not None:
+        wcs_from.bounding_box = None
+    if disable_bbox in ["to", "both"] and bbox_to is not None:
+        wcs_to.bounding_box = None
+    try:
+        x, y = wcs_to.world_to_pixel_values(
+            *wcs_from.pixel_to_world_values(x, y)
+        )
+    finally:
+        if bbox_from is not None:
+            wcs_from.bounding_box = bbox_from
+        if bbox_to is not None:
+            wcs_to.bounding_box = bbox_to
+
     pixmap = np.dstack([x, y])
     return pixmap
 

{drizzle-2.0.0.dist-info → drizzle-2.1.0.dist-info}/METADATA

@@ -1,40 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: drizzle
-Version: 2.0.0
+Version: 2.1.0
 Summary: A package for combining dithered images into a single image
 Author-email: STScI <help@stsci.edu>
-License: Copyright (C) 2011,2014 Association of Universities for Research in
-        Astronomy (AURA)
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions
-        are met:
-        
-            1. Redistributions of source code must retain the above
-              copyright notice, this list of conditions and the following
-              disclaimer.
-        
-            2. Redistributions in binary form must reproduce the above
-              copyright notice, this list of conditions and the following
-              disclaimer in the documentation and/or other materials
-              provided with the distribution.
-        
-            3. The name of AURA and its representatives may not be used to
-              endorse or promote products derived from this software without
-              specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR
-        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-        ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT,
-        INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-        STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-        OF THE POSSIBILITY OF SUCH DAMAGE.
-        
 Project-URL: Homepage, https://github.com/spacetelescope/drizzle
 Project-URL: Bug Tracker, https://github.com/spacetelescope/drizzle/issues
 Project-URL: Documentation, http://spacetelescope.github.io/drizzle/
@@ -43,18 +11,20 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
 Requires-Dist: numpy
-Requires-Dist: astropy
-Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-Requires-Dist: sphinx-automodapi ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
-Requires-Dist: matplotlib ; extra == 'docs'
-Requires-Dist: pytest-doctestplus ; extra == 'docs'
-Requires-Dist: tomli ; (python_version < "3.11") and extra == 'docs'
 Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
-Requires-Dist: pytest-doctestplus ; extra == 'test'
+Requires-Dist: astropy; extra == "test"
+Requires-Dist: gwcs; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-doctestplus; extra == "test"
+Provides-Extra: docs
+Requires-Dist: tomli; python_version < "3.11" and extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-automodapi; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Requires-Dist: matplotlib; extra == "docs"
+Requires-Dist: pytest-doctestplus; extra == "docs"
+Dynamic: license-file
 
 drizzle Documentation
 =====================
@@ -107,8 +77,8 @@ Requirements
 The Drizzle Algorithm
 ---------------------
 
-This section has been extracted from Chapter 2 of
-`The DrizzlePac Handbook <http://www.stsci.edu/hst/HST_overview/drizzlepac/documents/handbooks/drizzlepac.pdf>`_ [Driz2012]_
+This section has been extracted from Chapter 3 of
+`The DrizzlePac Handbook <https://hst-docs.stsci.edu/drizzpac>`_ [Driz2025]_
 
 There are a family of linear reconstruction techniques that, at two opposite
 extremes, are represented by the interlacing and shift-and-add techniques, with
@@ -199,4 +169,4 @@ for identifying cosmic rays in the original image. Blot requires the user
 to provide the world coordinate system (WCS)-based transformations in the
 form of a pixel map array as input.
 
-.. [Driz2012] Gonzaga, S., Hack, W., Fruchter, A., Mack, J., eds. 2012, The DrizzlePac Handbook. (Baltimore, STScI)
+.. [Driz2025] Anand, G. S., Mack, J., et al., 2025, “The DrizzlePac Handbook”, Version 3.0, (Baltimore: STScI)

drizzle-2.1.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+drizzle-2.1.0.dist-info/RECORD,,
+drizzle-2.1.0.dist-info/WHEEL,sha256=oqGJCpG61FZJmvyZ3C_0aCv-2mdfcY9e3fXvyUNmWfM,136
+drizzle-2.1.0.dist-info/top_level.txt,sha256=MA5uqwTj1sJBi-hCeQj9v3-sZ9nVUTe6bd_zGWTKy5A,8
+drizzle-2.1.0.dist-info/METADATA,sha256=Ib_IPFdMtDc3ZbRl-xNiL9FY6sGg2dmB4ZDlsOpwmlc,8932
+drizzle-2.1.0.dist-info/licenses/LICENSE.rst,sha256=zbEvAxiq9xY9gvf78KeZaARrnOsTcqC9FeOC6tg8VbA,1474
+drizzle/resample.py,sha256=-uMfJ2AEXfZrAkmi3uq9QOJfZaDx4Em8tOnSYWUVkm8,28450
+drizzle/util.py,sha256=dmaA4MtbUKZa-KTLosDsYG3nuVWCWkqRMCL8zqRf8II,811
+drizzle/__init__.py,sha256=oKjebdSpXrrHeytrwme-CcDlxqSXpED5P8GxUkYLmV0,313
+drizzle/utils.py,sha256=A_N1JpSjqrH7ZlcHphqaeiiCSRzDRqiP7oGrgi-r9eY,10556
+drizzle/cdrizzle.cpython-313-darwin.so,sha256=r4wTjd9VUFdFYIojunFBR4cfwCSY9PZWl4B6-yThUWg,151280
+drizzle/tests/test_utils.py,sha256=7Gt4p-ddGqldUGG4NiAP4kGqjnbPL7Mvcc1f1FtFZ5k,7465
+drizzle/tests/test_overlap_calc.py,sha256=HJPdD5waKM7j4iz8qT38mJyCQDVtb8CzGfgRUpjFQIk,6800
+drizzle/tests/test_cdrizzle.py,sha256=KnK6l8CZ7HxGx2OlziYtAsOMka3PebP-sLJuOIOMTAw,697
+drizzle/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+drizzle/tests/test_resample.py,sha256=9Pd0wpnjov4265eVnF5UOl8_5kyzy0jKyEx0ZR4gFJE,34094
+drizzle/tests/helpers.py,sha256=gFhCa68Ev0nX_oMNlf7gn60F6146jyUCMzu5vXGkhTU,6452

{drizzle-2.0.0.dist-info → drizzle-2.1.0.dist-info}/WHEEL

@@ -1,5 +1,6 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp313-cp313-macosx_11_0_arm64
+Generator: delocate 0.13.0
 

drizzle-2.0.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-drizzle-2.0.0.dist-info/RECORD,,
-drizzle-2.0.0.dist-info/WHEEL,sha256=EhaGmhgTZV8uqhZxBmQmxqlBexDOCFpUXsFLjK8lF9g,109
-drizzle-2.0.0.dist-info/LICENSE.rst,sha256=zbEvAxiq9xY9gvf78KeZaARrnOsTcqC9FeOC6tg8VbA,1474
-drizzle-2.0.0.dist-info/top_level.txt,sha256=MA5uqwTj1sJBi-hCeQj9v3-sZ9nVUTe6bd_zGWTKy5A,8
-drizzle-2.0.0.dist-info/METADATA,sha256=qcK15S6z6SyVHihtf5rksL29AhbesMaq32utR6dRfh4,10648
-drizzle/resample.py,sha256=HJD6l2xo9_VoYbWCAEbez5qKBYrGxoTPMuOGWwVnBmw,28280
-drizzle/util.py,sha256=dmaA4MtbUKZa-KTLosDsYG3nuVWCWkqRMCL8zqRf8II,811
-drizzle/__init__.py,sha256=oKjebdSpXrrHeytrwme-CcDlxqSXpED5P8GxUkYLmV0,313
-drizzle/utils.py,sha256=uyAPOQ7LbwT9IJ4O4NYj8luoDpsVS2iOOMBcj74dPvc,8537
-drizzle/cdrizzle.cpython-313-darwin.so,sha256=_K8YaJ1z4voTlCA6WJuHptN89OwFtC4-xCrLuU9C1V0,151056
-drizzle/tests/test_utils.py,sha256=0QdI24l6z2H1UdPabmNe3BwgTSA8b1_xHzRFhgEkV_c,5696
-drizzle/tests/test_overlap_calc.py,sha256=HJPdD5waKM7j4iz8qT38mJyCQDVtb8CzGfgRUpjFQIk,6800
-drizzle/tests/test_cdrizzle.py,sha256=KnK6l8CZ7HxGx2OlziYtAsOMka3PebP-sLJuOIOMTAw,697
-drizzle/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-drizzle/tests/test_resample.py,sha256=ke_A5htg9ez77ehsKjKn5hSjwDbat4_Vz0GI6IqPB7w,39577