Skip to content

Commit fa34dba

Browse files
Jammy2211Jammy2211
authored
Merge pull request #223 from Jammy2211/feature/remove_convolver
Feature/remove convolver
2 parents 58cf1f1 + 545fc09 commit fa34dba

File tree

21 files changed

+144
-200
lines changed

21 files changed

+144
-200
lines changed

‎autogalaxy/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
from autoarray.inversion.pixelization.border_relocator import BorderRelocator
2323
from autoarray.mask.mask_1d import Mask1D # noqa
2424
from autoarray.mask.mask_2d import Mask2D # noqa
25-
from autoarray.operators.convolver import Convolver # noqa
26-
from autoarray.operators.convolver import Convolver # noqa
2725
from autoarray.operators.transformer import TransformerDFT # noqa
2826
from autoarray.operators.transformer import TransformerNUFFT # noqa
2927
from autoarray.layout.layout import Layout2D # noqa

‎autogalaxy/analysis/analysis/analysis.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,18 @@ def profile_log_likelihood_function(
192192

193193
try:
194194
info_dict["image_pixels"] = self.dataset.grids.lp.shape_slim
195-
info_dict[
196-
"sub_total_light_profiles"
197-
] = self.dataset.grids.lp.over_sampler.sub_total
195+
info_dict["sub_total_light_profiles"] = (
196+
self.dataset.grids.lp.over_sampler.sub_total
197+
)
198198
except AttributeError:
199199
pass
200200

201201
if fit.model_obj.has(cls=aa.Pixelization):
202202
info_dict["use_w_tilde"] = fit.inversion.settings.use_w_tilde
203203
try:
204-
info_dict[
205-
"sub_total_pixelization"
206-
] = self.dataset.grids.pixelization.over_sampler.sub_total
204+
info_dict["sub_total_pixelization"] = (
205+
self.dataset.grids.pixelization.over_sampler.sub_total
206+
)
207207
except AttributeError:
208208
pass
209209
info_dict["use_positive_only_solver"] = (

‎autogalaxy/analysis/chaining_util.py‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -215,39 +215,29 @@ def extra_galaxies_from(
215215

216216
for extra_galaxy_index in range(len(result.instance.extra_galaxies)):
217217
if hasattr(result.instance.extra_galaxies[extra_galaxy_index], "mass"):
218-
extra_galaxies[
219-
extra_galaxy_index
220-
].mass.centre = result.instance.extra_galaxies[
221-
extra_galaxy_index
222-
].mass.centre
223-
extra_galaxies[
224-
extra_galaxy_index
225-
].mass.einstein_radius = result.model.extra_galaxies[
226-
extra_galaxy_index
227-
].mass.einstein_radius
218+
extra_galaxies[extra_galaxy_index].mass.centre = (
219+
result.instance.extra_galaxies[extra_galaxy_index].mass.centre
220+
)
221+
extra_galaxies[extra_galaxy_index].mass.einstein_radius = (
222+
result.model.extra_galaxies[extra_galaxy_index].mass.einstein_radius
223+
)
228224
if free_centre:
229-
extra_galaxies[
230-
extra_galaxy_index
231-
].mass.centre = result.model.extra_galaxies[
232-
extra_galaxy_index
233-
].mass.centre
225+
extra_galaxies[extra_galaxy_index].mass.centre = (
226+
result.model.extra_galaxies[extra_galaxy_index].mass.centre
227+
)
234228

235229
elif light_as_model:
236230
extra_galaxies = result.instance.extra_galaxies.as_model((LightProfile,))
237231

238232
for extra_galaxy_index in range(len(result.instance.extra_galaxies)):
239233
if extra_galaxies[extra_galaxy_index].bulge is not None:
240-
extra_galaxies[
241-
extra_galaxy_index
242-
].bulge.centre = result.instance.extra_galaxies[
243-
extra_galaxy_index
244-
].bulge.centre
234+
extra_galaxies[extra_galaxy_index].bulge.centre = (
235+
result.instance.extra_galaxies[extra_galaxy_index].bulge.centre
236+
)
245237
if free_centre:
246-
extra_galaxies[
247-
extra_galaxy_index
248-
].bulge.centre = result.model.extra_galaxies[
249-
extra_galaxy_index
250-
].bulge.centre
238+
extra_galaxies[extra_galaxy_index].bulge.centre = (
239+
result.model.extra_galaxies[extra_galaxy_index].bulge.centre
240+
)
251241

252242
else:
253243
extra_galaxies = result.instance.extra_galaxies.as_model(())

‎autogalaxy/convert.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@ def axis_ratio_and_angle_from(ell_comps: Tuple[float, float]) -> Tuple[float, fl
6666
angle *= 180.0 / np.pi
6767

6868
if use_jax:
69-
angle = jax.lax.select(
70-
angle < -45,
71-
angle + 180,
72-
angle
73-
)
69+
angle = jax.lax.select(angle < -45, angle + 180, angle)
7470
else:
7571
if abs(angle) > 45 and angle < 0:
7672
angle += 180

‎autogalaxy/galaxy/to_inversion.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,20 @@ def __init__(
8181
self.run_time_dict = run_time_dict
8282

8383
@property
84-
def convolver(self) -> Optional[aa.Convolver]:
84+
def psf(self) -> Optional[aa.Kernel2D]:
8585
"""
86-
Returns the convolver of the imaging dataset, if the inversion is performed on an imaging dataset.
86+
Returns the PSF of the imaging dataset, if the inversion is performed on an imaging dataset.
8787
8888
The `GalaxiesToInversion` class acts as an interface between the dataset and inversion module for
89-
both imaging and interferometer datasets. Only imaging datasets have a convolver, thus this property
90-
ensures that for an interferometer dataset code which references a convolver does not raise an error.
89+
both imaging and interferometer datasets. Only imaging datasets have a PSF, thus this property
90+
ensures that for an interferometer dataset code which references a PSF does not raise an error.
9191
9292
Returns
9393
-------
94-
The convolver of the imaging dataset, if it is an imaging dataset.
94+
The psf of the imaging dataset, if it is an imaging dataset.
9595
"""
9696
try:
97-
return self.dataset.convolver
97+
return self.dataset.psf
9898
except AttributeError:
9999
return None
100100

@@ -310,7 +310,7 @@ def cls_light_profile_func_list_galaxy_dict_from(
310310
lp_linear_func = LightProfileLinearObjFuncList(
311311
grid=self.dataset.grids.lp,
312312
blurring_grid=self.dataset.grids.blurring,
313-
convolver=self.dataset.convolver,
313+
psf=self.dataset.psf,
314314
light_profile_list=light_profile_list,
315315
regularization=light_profile.regularization,
316316
)

‎autogalaxy/imaging/fit_imaging.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def blurred_image(self) -> aa.Array2D:
103103

104104
return self.galaxies.blurred_image_2d_from(
105105
grid=self.grids.lp,
106-
convolver=self.dataset.convolver,
106+
psf=self.dataset.psf,
107107
blurring_grid=self.grids.blurring,
108108
)
109109

@@ -120,7 +120,7 @@ def galaxies_to_inversion(self) -> GalaxiesToInversion:
120120
data=self.profile_subtracted_image,
121121
noise_map=self.noise_map,
122122
grids=self.grids,
123-
convolver=self.dataset.convolver,
123+
psf=self.dataset.psf,
124124
w_tilde=self.w_tilde,
125125
)
126126

@@ -179,7 +179,7 @@ def galaxy_model_image_dict(self) -> Dict[Galaxy, np.ndarray]:
179179

180180
galaxy_blurred_image_2d_dict = self.galaxies.galaxy_blurred_image_2d_dict_from(
181181
grid=self.grids.lp,
182-
convolver=self.dataset.convolver,
182+
psf=self.dataset.psf,
183183
blurring_grid=self.grids.blurring,
184184
)
185185

0 commit comments

Comments
 (0)