drizzle 1.15.0__cp312-cp312-win32.whl → 1.15.2__cp312-cp312-win32.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,18 +1,18 @@
 drizzle/__init__.py,sha256=7M-hCW6QcKqJl0bdkCixW08PBJzLdMz6UTTzz2CKbgc,271
 drizzle/calc_pixmap.py,sha256=pM4Wvsjzc_gzb7NR23kLoxQy426ZXZF07tq59qqfEyA,1702
-drizzle/cdrizzle.cp312-win32.pyd,sha256=rDlWsRTtFZM-agWQq1OMlu6uNlMqtED0uFM5R_DnTX4,87552
+drizzle/cdrizzle.cp312-win32.pyd,sha256=3WNZoxK1d2OMpjfQkaNm0yjf4dAw7OtaS7XXN3FcNiI,88064
 drizzle/doblot.py,sha256=Qr5FdfV9-GY93Do5Jb9VAX-Y7M4EusIzAwwneV76Ai4,2576
 drizzle/dodrizzle.py,sha256=3h8FE46FoHUdt9T4FjXlSOQvGU_OQZm3FRXX33I2XDM,6979
 drizzle/drizzle.py,sha256=jnsv5GUX-NZHJN3GQhkWmmxDp1QK9iSFeYDpgNpeVVY,23441
 drizzle/util.py,sha256=8qPA7C8nqRL7vAjJ3Ip6yLeaIauJXLtV9JBAzIDUNiY,5999
 drizzle/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 drizzle/tests/test_cdrizzle.py,sha256=JHwVwOQ-evOD1XMPyKStxODy3AGwzXa6PMDGJldmFik,714
-drizzle/tests/test_drizzle.py,sha256=pAEDodtD3DkeqdHaX_MUZjiPmTsDzBQk03idymgWPQY,21010
+drizzle/tests/test_drizzle.py,sha256=n8rXSIL0hqoLs9p9zb106u4e1TKYdl89824lzRJO2UM,25193
 drizzle/tests/test_file_io.py,sha256=z6deDDdwGog03wC96poDDWoqafB2cfyR9q0PJzAaJ_g,5094
-drizzle/tests/test_overlap_calc.py,sha256=0vtswuOXa2bP4GLm2c5q1tuIWdXePfZ_6Xd0-odKia0,7062
+drizzle/tests/test_overlap_calc.py,sha256=Fv5ntD7hbFF_8vkiTrHeTWP7hgjQ7kkvkeY_IOZ8_aw,7062
 drizzle/tests/test_pixmap.py,sha256=B8Xj0MjpeP6Tc2vIL7gV7kBDmyDdo5SEafxGHrTnESM,2131
-drizzle-1.15.0.dist-info/LICENSE.rst,sha256=sUXj5W73D9TcOw5ZXaDdcthYdY2b2dTJPsxBuZTOYWQ,1505
-drizzle-1.15.0.dist-info/METADATA,sha256=sRkBxOA3jsNoEtTX9RWCW0ug4jbHBdIIJ81G50_PxHA,17024
-drizzle-1.15.0.dist-info/WHEEL,sha256=Q5m5OU7k24Q9oJcD9pbryDsMdvQYL1N4fomXgd4i1qg,98
-drizzle-1.15.0.dist-info/top_level.txt,sha256=MA5uqwTj1sJBi-hCeQj9v3-sZ9nVUTe6bd_zGWTKy5A,8
-drizzle-1.15.0.dist-info/RECORD,,
+drizzle-1.15.2.dist-info/LICENSE.rst,sha256=sUXj5W73D9TcOw5ZXaDdcthYdY2b2dTJPsxBuZTOYWQ,1505
+drizzle-1.15.2.dist-info/METADATA,sha256=s-h5LKfkjzHE6-kJHhyx6-eeN1YK5QVcFZYswwUcU00,17026
+drizzle-1.15.2.dist-info/WHEEL,sha256=N7fPzcANYQSP-1lTeUuLriuOSDjRoCV8Fj8BnfANnGQ,98
+drizzle-1.15.2.dist-info/top_level.txt,sha256=MA5uqwTj1sJBi-hCeQj9v3-sZ9nVUTe6bd_zGWTKy5A,8
+drizzle-1.15.2.dist-info/RECORD,,

{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: cp312-cp312-win32