drizzle 1.15.0__cp310-cp310-macosx_10_9_x86_64.whl → 1.15.2__cp310-cp310-macosx_10_9_x86_64.whl

drizzle/tests/test_drizzle.py

@@ -642,3 +642,157 @@ def test_context_planes():
 
     driz.add_image(image, inwcs)
     assert driz.outcon.shape == (2, 10, 10)
+
+
+@pytest.mark.parametrize(
+    'kernel',
+    [
+        'square',
+        'point',
+        'turbo',
+        pytest.param(
+            'lanczos2',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'lanczos3',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'gaussian',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+    ],
+)
+def test_flux_conservation_nondistorted(kernel):
+    n = 200
+    in_shape = (n, n)
+
+    # input coordinate grid:
+    y, x = np.indices(in_shape, dtype=np.float64)
+
+    # simulate a gaussian "star":
+    fwhm = 2.9
+    x0 = 50.0
+    y0 = 68.0
+    sig = fwhm / (2.0 * np.sqrt(2.0 * np.log(2.0 * fwhm)))
+    sig2 = sig * sig
+    star = np.exp(-0.5 / sig2 * ((x.astype(np.float32) - x0)**2 + (y.astype(np.float32) - y0)**2))
+    in_sci = (star / np.sum(star)).astype(np.float32)  # normalize to 1
+    in_wht = np.ones(in_shape, dtype=np.float32)
+
+    # linear shift:
+    xp = x + 0.5
+    yp = y + 0.2
+
+    pixmap = np.dstack([xp, yp])
+
+    out_shape = (int(yp.max()) + 1, int(xp.max()) + 1)
+    # make sure distorion is not moving flux out of the image towards negative
+    # coordinates (just because of the simple way of how we account for output
+    # image size)
+    assert np.min(xp) > -0.5 and np.min(yp) > -0.5
+
+    out_sci = np.zeros(out_shape, dtype=np.float32)
+    out_ctx = np.zeros(out_shape, dtype=np.int32)
+    out_wht = np.zeros(out_shape, dtype=np.float32)
+
+    cdrizzle.tdriz(
+        in_sci,
+        in_wht,
+        pixmap,
+        out_sci,
+        out_wht,
+        out_ctx,
+        pixfrac=1.0,
+        scale=1.0,
+        kernel=kernel,
+        in_units="cps",
+        expscale=1.0,
+        wtscale=1.0,
+    )
+
+    assert np.allclose(
+        np.sum(out_sci * out_wht),
+        np.sum(in_sci),
+        atol=0.0,
+        rtol=0.0001,
+    )
+
+@pytest.mark.parametrize(
+    'kernel',
+    [
+        'square',
+        'point',
+        'turbo',
+        pytest.param(
+            'lanczos2',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'lanczos3',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'gaussian',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+    ],
+)
+def test_flux_conservation_distorted(kernel):
+    n = 200
+    in_shape = (n, n)
+
+    # input coordinate grid:
+    y, x = np.indices(in_shape, dtype=np.float64)
+
+    # simulate a gaussian "star":
+    fwhm = 2.9
+    x0 = 50.0
+    y0 = 68.0
+    sig = fwhm / (2.0 * np.sqrt(2.0 * np.log(2.0 * fwhm)))
+    sig2 = sig * sig
+    star = np.exp(-0.5 / sig2 * ((x.astype(np.float32) - x0)**2 + (y.astype(np.float32) - y0)**2))
+    in_sci = (star / np.sum(star)).astype(np.float32)  # normalize to 1
+    in_wht = np.ones(in_shape, dtype=np.float32)
+
+    # linear shift:
+    xp = x + 0.5
+    yp = y + 0.2
+    # add distortion:
+    xp += 1e-4 * x**2 + 1e-5 * x * y
+    yp += 1e-3 * y**2 - 2e-5 * x * y
+
+    pixmap = np.dstack([xp, yp])
+
+    out_shape = (int(yp.max()) + 1, int(xp.max()) + 1)
+    # make sure distorion is not moving (pixels with) flux out of the image
+    # towards negative coordinates (just because of the simple way of how we
+    # account for output image size):
+    assert np.min(xp) > -0.5 and np.min(yp) > -0.5
+
+    out_sci = np.zeros(out_shape, dtype=np.float32)
+    out_ctx = np.zeros(out_shape, dtype=np.int32)
+    out_wht = np.zeros(out_shape, dtype=np.float32)
+
+    cdrizzle.tdriz(
+        in_sci,
+        in_wht,
+        pixmap,
+        out_sci,
+        out_wht,
+        out_ctx,
+        pixfrac=1.0,
+        scale=1.0,
+        kernel=kernel,
+        in_units="cps",
+        expscale=1.0,
+        wtscale=1.0,
+    )
+
+    assert np.allclose(
+        np.sum(out_sci * out_wht),
+        np.sum(in_sci),
+        atol=0.0,
+        rtol=0.0001,
+    )

drizzle/tests/test_overlap_calc.py

@@ -9,7 +9,7 @@ from drizzle.cdrizzle import clip_polygon, invert_pixmap
 SQ2 = 1.0 / sqrt(2.0)
 
 
-def _is_poly_eq(p1, p2, rtol=0, atol=1e-12):
+def _is_poly_eq(p1, p2, rtol=0, atol=4e-12):
     if len(p1) != len(p2):
         return False
 

{drizzle-1.15.0.dist-info → drizzle-1.15.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.15.0
+Version: 1.15.2
 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
@@ -39,7 +39,7 @@ 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/
 Project-URL: Source Code, https://github.com/spacetelescope/drizzle
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
 Requires-Dist: numpy
@@ -91,7 +91,7 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.9 or later
+- Python 3.10 or later
 
 - Numpy
 

{drizzle-1.15.0.dist-info → drizzle-1.15.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
-drizzle-1.15.0.dist-info/RECORD,,
-drizzle-1.15.0.dist-info/WHEEL,sha256=qW9xlwewyQBufEUzmM-8CIjZ7fR659LOSrcgouui4Z4,111
-drizzle-1.15.0.dist-info/LICENSE.rst,sha256=zbEvAxiq9xY9gvf78KeZaARrnOsTcqC9FeOC6tg8VbA,1474
-drizzle-1.15.0.dist-info/top_level.txt,sha256=MA5uqwTj1sJBi-hCeQj9v3-sZ9nVUTe6bd_zGWTKy5A,8
-drizzle-1.15.0.dist-info/METADATA,sha256=xWoAf_uAL6rgQwBA-8W1t4SiMu7x3c7Wz7yBUNzm1s8,16660
-drizzle/cdrizzle.cpython-310-darwin.so,sha256=JvsUyMGuxTC9OKsJV4xfO0oa1Cg8O_nbrzwqJQJoq3Q,153760
+drizzle-1.15.2.dist-info/RECORD,,
+drizzle-1.15.2.dist-info/WHEEL,sha256=5gVbVe_w8vFuKIeI1RffqCqgT_cNTJucal8EyR-41SQ,111
+drizzle-1.15.2.dist-info/LICENSE.rst,sha256=zbEvAxiq9xY9gvf78KeZaARrnOsTcqC9FeOC6tg8VbA,1474
+drizzle-1.15.2.dist-info/top_level.txt,sha256=MA5uqwTj1sJBi-hCeQj9v3-sZ9nVUTe6bd_zGWTKy5A,8
+drizzle-1.15.2.dist-info/METADATA,sha256=wdh5D7Kb6IkWZHUauZmhCZcPiQoagmVbEwyx3gl6xBc,16662
+drizzle/cdrizzle.cpython-310-darwin.so,sha256=TOk8Zv_tCfH8_bogq--FByg_EiFMvTanNr_tWL_YoYo,154016
 drizzle/calc_pixmap.py,sha256=psEyav1Yq5AHhN6eiBbw5bGczfPuzFKx-1Eain0xqAQ,1650
 drizzle/drizzle.py,sha256=wOlGmSWsAgZrWWBX426VzYEXZXSktdTh88lywNcPsME,22872
 drizzle/util.py,sha256=vtlLrpe1zZriph0_PEP1LfuCODhQlILt9yp76ZqBzB0,5743
 drizzle/doblot.py,sha256=cQDtVzerm4PS8niXGSNxTgR2wm-DsBGJ86iD4PZoYY8,2496
 drizzle/__init__.py,sha256=8vOMcRDCSKhRk4jkqjuLhr5U7ouNFqp7cUtM_sFQm1I,260
 drizzle/dodrizzle.py,sha256=BwhadcgAzUg4_aJszv7P1kTMcKAGEN01h0zlYci-Yf8,6790
-drizzle/tests/test_overlap_calc.py,sha256=1_T7C89JTsBtKoBjps9xBTDUZAyUQ8jJ-hr8IASLwrk,6800
-drizzle/tests/test_drizzle.py,sha256=vaEa4UxkdRIaQUSkg3eagkQmldDj66zcy0lLRkPK0Wc,20366
+drizzle/tests/test_overlap_calc.py,sha256=p679e3zc68lJkQb42fVSylGHgBosroG8VIlqp9LdAfg,6800
+drizzle/tests/test_drizzle.py,sha256=OVgAULAlvhccKsHDnyoekIPl0MOIMuaBLvFhFctUG_s,24395
 drizzle/tests/test_pixmap.py,sha256=14RU1bv8eU8woQq0AcVO4L46linYyNU5dBkFlEv8qeA,2055
 drizzle/tests/test_cdrizzle.py,sha256=8K3vKDhAAq4X4Bbe2YWIJ9O6ajQz-1jSRP5JTECKrhM,690
 drizzle/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0

{drizzle-1.15.0.dist-info → drizzle-1.15.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_10_9_x86_64