ResamplingRenderer (#230)

* k-space resampling (as I understand it but not working that well)

* insert_into as standalone function

* added Lanczos renderer (test is not good yet); reversed coordinate convention for resample2d

* added Moments.convolve (+test); increased ProfileMorphology shape to 15*size

* fixed import for Lanczos resampler

* undid my changes to resampling renderer

* added Moment methods; redefined center shift for ProfileMorphology accordingly

* introduced translation to ResamplingRenderer; whole slew of minor corrections of Frame/WCS

* use jacobian only for resample_fourier

* made PSF (de)convolution optional in ResamplingRenderer

* switched test_renderer to Moment-based tests

* minor fix

* minor fixes; removed source validation checks

* import scarlet2 as sc2

Author: pmelchior

docs/howto/multiresolution.ipynb

@@ -25,9 +25,9 @@
     "from astropy.table import Table\n",
     "from astropy.wcs import WCS\n",
     "\n",
-    "import scarlet2\n",
+    "import scarlet2 as sc2\n",
     "\n",
-    "scarlet2.set_validation(False)"
+    "sc2.set_validation(False)"
    ]
   },
   {
@@ -114,14 +114,14 @@
    "outputs": [],
    "source": [
     "# Scarlet Observations\n",
-    "obs_hst = scarlet2.Observation(\n",
-    "    data_hst, wcs=wcs_hst, psf=scarlet2.ArrayPSF(psf_hst_data), channels=[\"F814W\"], weights=obs_hst_weights\n",
+    "obs_hst = sc2.Observation(\n",
+    "    data_hst, wcs=wcs_hst, psf=sc2.ArrayPSF(psf_hst_data), channels=[\"F814W\"], weights=obs_hst_weights\n",
     ")\n",
     "\n",
-    "obs_hsc = scarlet2.Observation(\n",
+    "obs_hsc = sc2.Observation(\n",
     "    data_hsc,\n",
     "    wcs=wcs_hsc,\n",
-    "    psf=scarlet2.ArrayPSF(psf_hsc_data),\n",
+    "    psf=sc2.ArrayPSF(psf_hsc_data),\n",
     "    channels=[\"g\", \"r\", \"i\", \"z\", \"y\"],\n",
     "    weights=obs_hsc_weights,\n",
     ")"
@@ -149,7 +149,7 @@
    },
    "outputs": [],
    "source": [
-    "model_frame = scarlet2.Frame.from_observations(\n",
+    "model_frame = sc2.Frame.from_observations(\n",
     "    observations=[obs_hst, obs_hsc],\n",
     "    coverage=\"union\",  # or \"intersection\"\n",
     ")"
@@ -182,13 +182,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "norm_hst = scarlet2.plot.AsinhAutomaticNorm(obs_hst)\n",
-    "norm_hsc = scarlet2.plot.AsinhAutomaticNorm(obs_hsc)\n",
+    "norm_hst = sc2.plot.AsinhAutomaticNorm(obs_hst)\n",
+    "norm_hsc = sc2.plot.AsinhAutomaticNorm(obs_hsc)\n",
     "\n",
-    "scarlet2.plot.observation(\n",
+    "sc2.plot.observation(\n",
     "    obs_hst, norm=norm_hst, sky_coords=ra_dec, show_psf=True, label_kwargs={\"color\": \"red\"}\n",
     ")\n",
-    "scarlet2.plot.observation(obs_hsc, norm=norm_hsc, sky_coords=ra_dec, show_psf=True);"
+    "sc2.plot.observation(obs_hsc, norm=norm_hsc, sky_coords=ra_dec, show_psf=True);"
    ]
   },
   {
@@ -206,16 +206,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import scarlet2.init as init\n",
     "\n",
-    "with scarlet2.Scene(model_frame) as scene:\n",
+    "with sc2.Scene(model_frame) as scene:\n",
     "    for i, center in enumerate(ra_dec):\n",
     "        try:\n",
-    "            spectrum, morph = init.from_gaussian_moments([obs_hst, obs_hsc], center, min_corr=0.99)\n",
+    "            spectrum, morph = sc2.init.from_gaussian_moments([obs_hst, obs_hsc], center, min_corr=0.99)\n",
     "        except ValueError:\n",
-    "            spectrum = init.pixel_spectrum([obs_hst, obs_hsc], center)\n",
-    "            morph = init.compact_morphology()\n",
-    "        scarlet2.Source(center, spectrum, morph)"
+    "            spectrum = sc2.init.pixel_spectrum([obs_hst, obs_hsc], center)\n",
+    "            morph = sc2.init.compact_morphology()\n",
+    "        sc2.Source(center, spectrum, morph)"
    ]
   },
   {
@@ -225,7 +224,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "scarlet2.plot.scene(\n",
+    "sc2.plot.scene(\n",
     "    scene,\n",
     "    observation=obs_hst,\n",
     "    show_rendered=True,\n",
@@ -235,7 +234,7 @@
     "    add_boxes=True,\n",
     "    label_kwargs={\"color\": \"red\"},\n",
     ")\n",
-    "scarlet2.plot.scene(\n",
+    "sc2.plot.scene(\n",
     "    scene,\n",
     "    observation=obs_hsc,\n",
     "    show_rendered=True,\n",
@@ -246,16 +245,6 @@
     ");"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5af1c3e91450403a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "obs_hsc.renderer"
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "5765f3385e73e562",
@@ -290,20 +279,19 @@
    "source": [
     "from numpyro.distributions import constraints\n",
     "from functools import partial\n",
-    "from scarlet2.module import relative_step\n",
     "\n",
-    "spec_step = partial(relative_step, factor=0.05)\n",
-    "morph_step = partial(relative_step, factor=1e-3)\n",
+    "spec_step = partial(sc2.relative_step, factor=0.05)\n",
+    "morph_step = partial(sc2.relative_step, factor=1e-3)\n",
     "\n",
-    "with scarlet2.Parameters(scene) as parameters:\n",
+    "with sc2.Parameters(scene) as parameters:\n",
     "    for i in range(len(scene.sources)):\n",
-    "        scarlet2.Parameter(\n",
+    "        sc2.Parameter(\n",
     "            scene.sources[i].spectrum,\n",
     "            name=f\"spectrum.{i}\",\n",
     "            constraint=constraints.positive,\n",
     "            stepsize=spec_step,\n",
     "        )\n",
-    "        scarlet2.Parameter(\n",
+    "        sc2.Parameter(\n",
     "            scene.sources[i].morphology,\n",
     "            name=f\"morph.{i}\",\n",
     "            constraint=constraints.unit_interval,\n",
@@ -346,7 +334,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "scarlet2.plot.scene(\n",
+    "sc2.plot.scene(\n",
     "    scene_,\n",
     "    observation=obs_hst,\n",
     "    show_rendered=True,\n",
@@ -358,7 +346,7 @@
     "    box_kwargs={\"edgecolor\": \"red\", \"facecolor\": \"none\"},\n",
     "    label_kwargs={\"color\": \"red\"},\n",
     ")\n",
-    "scarlet2.plot.scene(\n",
+    "sc2.plot.scene(\n",
     "    scene_,\n",
     "    observation=obs_hsc,\n",
     "    show_rendered=True,\n",

src/scarlet2/bbox.py

@@ -89,28 +89,6 @@ def contains(self, p):
                 return False
         return True
 
-    def insert_into(self, image, sub):
-        """Insert `sub` into `image` according to this bbox
-
-        Inverse operation to :func:`~scarlet.bbox.Box.extract_from`.
-
-        Parameters
-        ----------
-        image: array
-            Full image
-        sub: array
-            Extracted sub-image
-
-        Returns
-        -------
-        image: array
-        """
-        imbox = Box(image.shape)
-
-        im_slices, sub_slices = overlap_slices(imbox, self)
-        image[im_slices] = sub[sub_slices]
-        return image
-
     def get_extent(self):
         """Return the start and end coordinates."""
         return [self.start[-1], self.stop[-1], self.start[-2], self.stop[-2]]
@@ -283,3 +261,31 @@ def overlap_slices(bbox1, bbox2, return_boxes=False):
         _bbox2.slices,
     )
     return slices
+
+
+def insert_into(image, sub, bbox):
+    """Insert `sub` into `image` according to this bbox
+
+    Inverse operation to :func:`~scarlet.bbox.Box.extract_from`.
+
+    Parameters
+    ----------
+    image: array
+        Full image
+    sub: array
+        Smaller sub-image
+    bbox: Box
+        Bounding box that describes the shape and position of `sub` in the pixel coordinates of `image`.
+    Returns
+    -------
+    image: array
+        Image with `sub` inserted at `bbox`.
+    """
+    imbox = Box(image.shape)
+
+    im_slices, sub_slices = overlap_slices(imbox, bbox)
+    try:
+        image[im_slices] = sub[sub_slices]  # numpy arrays
+    except TypeError:
+        image = image.at[im_slices].set(sub[sub_slices])  # jax arrays
+    return image