Skip to content

Commit 10d09f4

Browse files
Jammy2211Jammy2211
authored andcommitted
added xp to key functions
1 parent a1db68c commit 10d09f4

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

autogalaxy/galaxy/galaxies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def image_2d_from(
119119
)
120120

121121
def galaxy_image_2d_dict_from(
122-
self, grid: aa.type.Grid2DLike, xp=np, operated_only: Optional[bool] = None
122+
self, grid: aa.type.Grid2DLike, xp=np, operated_only: Optional[bool] = None,
123123
) -> {Galaxy: np.ndarray}:
124124
"""
125125
Returns a dictionary associating every `Galaxy` object with its corresponding 2D image, using the instance

autogalaxy/imaging/fit_imaging.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ def galaxy_image_dict(self) -> Dict[Galaxy, np.ndarray]:
185185

186186
galaxy_image_2d_dict = self.galaxies.galaxy_image_2d_dict_from(
187187
grid=self.grids.lp,
188+
xp=self._xp
188189
)
189190

190191
galaxy_linear_obj_image_dict = self.galaxy_linear_obj_data_dict_from(
@@ -212,6 +213,7 @@ def galaxy_model_image_dict(self) -> Dict[Galaxy, np.ndarray]:
212213
grid=self.grids.lp,
213214
psf=self.dataset.psf,
214215
blurring_grid=self.grids.blurring,
216+
xp=self._xp
215217
)
216218

217219
galaxy_linear_obj_image_dict = self.galaxy_linear_obj_data_dict_from(

autogalaxy/interferometer/fit_interferometer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def galaxy_image_dict(self) -> Dict[Galaxy, np.ndarray]:
161161
For modeling, this dictionary is used to set up the `adapt_images` that adapt certain pixelizations to the
162162
data being fitted.
163163
"""
164-
galaxy_image_dict = self.galaxies.galaxy_image_2d_dict_from(grid=self.grids.lp)
164+
galaxy_image_dict = self.galaxies.galaxy_image_2d_dict_from(grid=self.grids.lp, xp=self._xp)
165165

166166
galaxy_linear_obj_image_dict = self.galaxy_linear_obj_data_dict_from(
167167
use_operated=False
@@ -184,7 +184,7 @@ def galaxy_model_visibilities_dict(self) -> Dict[Galaxy, np.ndarray]:
184184
data being fitted.
185185
"""
186186
galaxy_model_visibilities_dict = self.galaxies.galaxy_visibilities_dict_from(
187-
grid=self.grids.lp, transformer=self.dataset.transformer
187+
grid=self.grids.lp, transformer=self.dataset.transformer, xp=self._xp
188188
)
189189

190190
galaxy_linear_obj_data_dict = self.galaxy_linear_obj_data_dict_from(

autogalaxy/operate/image.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,12 @@ class OperateImageGalaxies(OperateImageList):
363363
"""
364364

365365
def galaxy_image_2d_dict_from(
366-
self, grid: aa.Grid2D, operated_only: Optional[bool] = None
366+
self, grid: aa.Grid2D, xp=np, operated_only: Optional[bool] = None
367367
) -> Dict[Galaxy, aa.Array2D]:
368368
raise NotImplementedError
369369

370370
def galaxy_blurred_image_2d_dict_from(
371-
self, grid, psf, blurring_grid
371+
self, grid, psf, blurring_grid, xp=np
372372
) -> Dict[Galaxy, aa.Array2D]:
373373
"""
374374
Evaluate the light object's dictionary mapping galaixes to their corresponding 2D images and convolve each
@@ -392,15 +392,15 @@ def galaxy_blurred_image_2d_dict_from(
392392
"""
393393

394394
galaxy_image_2d_not_operated_dict = self.galaxy_image_2d_dict_from(
395-
grid=grid, operated_only=False
395+
grid=grid, operated_only=False, xp=xp
396396
)
397397

398398
galaxy_blurring_image_2d_not_operated_dict = self.galaxy_image_2d_dict_from(
399-
grid=blurring_grid, operated_only=False
399+
grid=blurring_grid, operated_only=False, xp=xp
400400
)
401401

402402
galaxy_image_2d_operated_dict = self.galaxy_image_2d_dict_from(
403-
grid=grid, operated_only=True
403+
grid=grid, operated_only=True, xp=xp
404404
)
405405

406406
galaxy_blurred_image_2d_dict = {}
@@ -414,6 +414,7 @@ def galaxy_blurred_image_2d_dict_from(
414414
blurred_image_2d = psf.convolved_image_from(
415415
image=image_2d_not_operated,
416416
blurring_image=blurring_image_2d_not_operated,
417+
xp=xp
417418
)
418419

419420
image_2d_operated = galaxy_image_2d_operated_dict[galaxy_key]
@@ -451,7 +452,7 @@ def galaxy_visibilities_dict_from(
451452
in the uv-plane.
452453
"""
453454

454-
galaxy_image_2d_dict = self.galaxy_image_2d_dict_from(grid=grid)
455+
galaxy_image_2d_dict = self.galaxy_image_2d_dict_from(grid=grid, xp=xp)
455456

456457
galaxy_visibilities_dict = {}
457458

0 commit comments

Comments
 (0)