Skip to content

Commit 38b77ee

Browse files
Jammy2211Jammy2211
Jammy2211
authored and
Jammy2211
committed
NFW and other mass profile fixes
1 parent 2627766 commit 38b77ee

File tree

14 files changed

+22
-22
lines changed

14 files changed

+22
-22
lines changed

‎autogalaxy/profiles/light/standard/chameleon.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def image_2d_from(
117117
The image of the Chameleon evaluated at every (y,x) coordinate on the transformed grid.
118118
"""
119119
return self.image_2d_via_radii_from(
120-
self.elliptical_radii_grid_from(grid=grid, **kwargs)
120+
self.elliptical_radii_grid_from(grid=grid, xp=xp, **kwargs)
121121
)
122122

123123

‎autogalaxy/profiles/mass/dark/abstract.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def convergence_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
6666
6767
"""
6868

69-
grid_eta = self.elliptical_radii_grid_from(grid=grid, **kwargs)
69+
grid_eta = self.elliptical_radii_grid_from(grid=grid, xp=xp, **kwargs)
7070

7171
return self.convergence_func(grid_radius=grid_eta)
7272

@@ -83,7 +83,7 @@ def convergence_2d_via_mge_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs)
8383
8484
"""
8585

86-
elliptical_radii = self.elliptical_radii_grid_from(grid=grid, **kwargs)
86+
elliptical_radii = self.elliptical_radii_grid_from(grid=grid, xp=xp, **kwargs)
8787

8888
return self._convergence_2d_via_mge_from(grid_radii=elliptical_radii)
8989

‎autogalaxy/profiles/mass/dark/nfw.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def convergence_2d_via_cse_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs)
137137
The grid of (y,x) arc-second coordinates the convergence is computed on.
138138
"""
139139

140-
elliptical_radii = self.elliptical_radii_grid_from(grid=grid, **kwargs)
140+
elliptical_radii = self.elliptical_radii_grid_from(grid=grid, xp=xp, **kwargs)
141141

142142
return self._convergence_2d_via_cse_from(grid_radii=elliptical_radii)
143143

@@ -364,7 +364,7 @@ def __init__(
364364
)
365365

366366
def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
367-
return self.deflections_2d_via_analytic_from(grid=grid, **kwargs)
367+
return self.deflections_2d_via_analytic_from(grid=grid, xp=xp, **kwargs)
368368

369369
@aa.grid_dec.to_vector_yx
370370
@aa.grid_dec.transform
@@ -381,7 +381,7 @@ def deflections_2d_via_analytic_from(
381381
"""
382382

383383
eta = xp.multiply(
384-
1.0 / self.scale_radius, self.radial_grid_from(grid=grid, **kwargs).array
384+
1.0 / self.scale_radius, self.radial_grid_from(grid=grid, xp=xp, **kwargs).array
385385
)
386386

387387
deflection_grid = xp.multiply(
@@ -395,7 +395,7 @@ def deflections_2d_via_analytic_from(
395395

396396
def deflection_func_sph(self, grid_radius, xp=np):
397397
grid_radius = grid_radius + 0j
398-
return xp.real(self.coord_func_h(grid_radius=grid_radius))
398+
return xp.real(self.coord_func_h(grid_radius=grid_radius, xp=xp))
399399

400400
@aa.over_sample
401401
@aa.grid_dec.to_array

‎autogalaxy/profiles/mass/dark/nfw_truncated.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
3939
"""
4040

4141
eta = xp.multiply(
42-
1.0 / self.scale_radius, self.radial_grid_from(grid=grid, **kwargs).array
42+
1.0 / self.scale_radius, self.radial_grid_from(grid=grid, xp=xp, **kwargs).array
4343
)
4444

4545
deflection_grid = xp.multiply(

‎autogalaxy/profiles/mass/point/point.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def potential_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
4141
@aa.grid_dec.to_vector_yx
4242
@aa.grid_dec.transform
4343
def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
44-
grid_radii = self.radial_grid_from(grid=grid, **kwargs)
44+
grid_radii = self.radial_grid_from(grid=grid, xp=xp, **kwargs)
4545
return self._cartesian_grid_via_radial_from(
4646
grid=grid, radius=self.einstein_radius**2 / grid_radii, xp=xp
4747
)

‎autogalaxy/profiles/mass/point/smbh_binary.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
134134
"""
135135
return self.smbh_0.deflections_yx_2d_from(
136136
grid=grid
137-
) + self.smbh_1.deflections_yx_2d_from(grid=grid, **kwargs)
137+
) + self.smbh_1.deflections_yx_2d_from(grid=grid, xp=xp, **kwargs)

‎autogalaxy/profiles/mass/sheets/mass_sheet.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def potential_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
3535
@aa.grid_dec.to_vector_yx
3636
@aa.grid_dec.transform
3737
def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
38-
grid_radii = self.radial_grid_from(grid=grid, **kwargs)
38+
grid_radii = self.radial_grid_from(grid=grid, xp=xp, **kwargs)
3939
return self._cartesian_grid_via_radial_from(
4040
grid=grid, radius=self.kappa * grid_radii, xp=xp
4141
)

‎autogalaxy/profiles/mass/stellar/chameleon.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(
4848
self.core_radius_1 = core_radius_1
4949

5050
def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
51-
return self.deflections_2d_via_analytic_from(grid=grid, **kwargs)
51+
return self.deflections_2d_via_analytic_from(grid=grid, xp=xp, **kwargs)
5252

5353
@aa.grid_dec.to_vector_yx
5454
@aa.grid_dec.transform
@@ -143,7 +143,7 @@ def convergence_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
143143
The grid of (y,x) arc-second coordinates the convergence is computed on.
144144
"""
145145
return self.convergence_func(
146-
self.elliptical_radii_grid_from(grid=grid, **kwargs)
146+
self.elliptical_radii_grid_from(grid=grid, xp=xp, **kwargs)
147147
)
148148

149149
def convergence_func(self, grid_radius: float) -> float:

‎autogalaxy/profiles/mass/stellar/gaussian.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
5353
if self.intensity == 0.0:
5454
return np.zeros((grid.shape[0], 2))
5555

56-
return self.deflections_2d_via_analytic_from(grid=grid, **kwargs)
56+
return self.deflections_2d_via_analytic_from(grid=grid, xp=xp, **kwargs)
5757

5858
@aa.grid_dec.to_vector_yx
5959
@aa.grid_dec.transform

‎autogalaxy/profiles/mass/stellar/sersic.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def __init__(
121121
self.sersic_index = sersic_index
122122

123123
def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs):
124-
return self.deflections_2d_via_cse_from(grid=grid, **kwargs)
124+
return self.deflections_2d_via_cse_from(grid=grid, xp=xp, **kwargs)
125125

126126
@aa.grid_dec.to_vector_yx
127127
@aa.grid_dec.transform
@@ -164,7 +164,7 @@ def deflections_2d_via_cse_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs)
164164
grid
165165
The grid of (y,x) arc-second coordinates the convergence is computed on.
166166
"""
167-
return self._deflections_2d_via_cse_from(grid=grid, **kwargs)
167+
return self._deflections_2d_via_cse_from(grid=grid, xp=xp, **kwargs)
168168

169169
@aa.over_sample
170170
@aa.grid_dec.to_array
@@ -229,7 +229,7 @@ def convergence_2d_via_cse_from(self, grid: aa.type.Grid2DLike, xp=np, **kwargs)
229229
The grid of (y,x) arc-second coordinates the convergence is computed on.
230230
"""
231231

232-
elliptical_radii = self.elliptical_radii_grid_from(grid=grid, **kwargs)
232+
elliptical_radii = self.elliptical_radii_grid_from(grid=grid, xp=xp, **kwargs)
233233

234234
return self._convergence_2d_via_cse_from(grid_radii=elliptical_radii)
235235

0 commit comments

Comments
 (0)