Skip to content

refactor: unify the blurred-image evaluate/pre-bin/convolve tail #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jammy2211 merged 1 commit into from
Jul 9, 2026
Merged

refactor: unify the blurred-image evaluate/pre-bin/convolve tail #489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 58 additions & 46 deletions autogalaxy/operate/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,40 @@ def _binned_for_convolution(values, grid, psf, xp=np):
xp=xp,
)

def _convolved_from_evaluations(
self,
image_2d,
blurring_image_2d,
grid,
blurring_grid,
psf,
convolution_mask,
xp=np,
):
"""
Convolve one pair of evaluated (image, blurring image) values: the shared
tail of every blurred-image variant. When the PSF is oversampled
(``convolution_mask`` is not None) the values are partially pre-binned to
the convolution resolution (the k x s coupling) and convolved at the fine
resolution; otherwise the regular image-resolution helper is delegated to.
"""
if convolution_mask is not None:
return psf.convolved_image_from(
image=self._binned_for_convolution(image_2d, grid, psf, xp=xp),
blurring_image=self._binned_for_convolution(
blurring_image_2d, blurring_grid, psf, xp=xp
),
mask=convolution_mask,
xp=xp,
)

return self._blurred_image_2d_from(
image_2d=image_2d,
blurring_image_2d=blurring_image_2d,
psf=psf,
xp=xp,
)

@staticmethod
def _psf_evaluation_grids_from(grid, blurring_grid, psf):
"""
Expand Down Expand Up @@ -181,24 +215,15 @@ def blurred_image_2d_from(
grid=evaluation_blurring_grid, xp=xp, operated_only=False
)

if convolution_mask is not None:
blurred_image_2d = psf.convolved_image_from(
image=self._binned_for_convolution(
image_2d_not_operated, grid, psf, xp=xp
),
blurring_image=self._binned_for_convolution(
blurring_image_2d_not_operated, blurring_grid, psf, xp=xp
),
mask=convolution_mask,
xp=xp,
)
else:
blurred_image_2d = self._blurred_image_2d_from(
image_2d=image_2d_not_operated,
blurring_image_2d=blurring_image_2d_not_operated,
psf=psf,
xp=xp,
)
blurred_image_2d = self._convolved_from_evaluations(
image_2d=image_2d_not_operated,
blurring_image_2d=blurring_image_2d_not_operated,
grid=grid,
blurring_grid=blurring_grid,
psf=psf,
convolution_mask=convolution_mask,
xp=xp,
)

if self.has(cls=LightProfileOperated):
image_2d_operated = self.image_2d_from(grid=grid, xp=xp, operated_only=True)
Expand Down Expand Up @@ -456,22 +481,14 @@ def blurred_image_2d_list_from(
image_2d_not_operated = image_2d_not_operated_list[i]
blurring_image_2d_not_operated = blurring_image_2d_not_operated_list[i]

if convolution_mask is not None:
blurred_image_2d = psf.convolved_image_from(
image=self._binned_for_convolution(
image_2d_not_operated, grid, psf
),
blurring_image=self._binned_for_convolution(
blurring_image_2d_not_operated, blurring_grid, psf
),
mask=convolution_mask,
)
else:
blurred_image_2d = self._blurred_image_2d_from(
image_2d=image_2d_not_operated,
blurring_image_2d=blurring_image_2d_not_operated,
psf=psf,
)
blurred_image_2d = self._convolved_from_evaluations(
image_2d=image_2d_not_operated,
blurring_image_2d=blurring_image_2d_not_operated,
grid=grid,
blurring_grid=blurring_grid,
psf=psf,
convolution_mask=convolution_mask,
)

image_2d_operated = image_2d_operated_list[i]

Expand Down Expand Up @@ -630,18 +647,13 @@ def galaxy_blurred_image_2d_dict_from(
galaxy_key
]

if convolution_mask is not None:
image_2d_not_operated = self._binned_for_convolution(
image_2d_not_operated, grid, psf, xp=xp
)
blurring_image_2d_not_operated = self._binned_for_convolution(
blurring_image_2d_not_operated, blurring_grid, psf, xp=xp
)

blurred_image_2d = psf.convolved_image_from(
image=image_2d_not_operated,
blurring_image=blurring_image_2d_not_operated,
mask=convolution_mask,
blurred_image_2d = self._convolved_from_evaluations(
image_2d=image_2d_not_operated,
blurring_image_2d=blurring_image_2d_not_operated,
grid=grid,
blurring_grid=blurring_grid,
psf=psf,
convolution_mask=convolution_mask,
xp=xp,
)

Expand Down
Loading