Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
82622f7
remove grid relocate radial
Jammy2211 Apr 3, 2025
2ace7ea
pylops docs remove
Jammy2211 Apr 4, 2025
092f7be
fix test_convert with absolution pytest error
Jammy2211 Apr 5, 2025
ae60599
geometry profile tests pass
Jammy2211 Apr 5, 2025
e54fbc6
delete test_radial_minima.py
Jammy2211 Apr 5, 2025
a6cb5b8
fixes to geometry profiles when testing light profiles
Jammy2211 Apr 5, 2025
ac4878e
fix test_sersic_core
Jammy2211 Apr 5, 2025
286f3fc
fix test sersic
Jammy2211 Apr 5, 2025
0a8e295
fix test moffat
Jammy2211 Apr 5, 2025
166eacc
test_gaussian fixed
Jammy2211 Apr 5, 2025
f2661e6
exponential and dev vauc
Jammy2211 Apr 5, 2025
8f15844
eff profile
Jammy2211 Apr 5, 2025
72090ad
chameoleon
Jammy2211 Apr 5, 2025
109c166
fix a standard light profile test by altering autoarray
Jammy2211 Apr 5, 2025
c64fff3
luminsoity caslculation uses ArrayIrregular
Jammy2211 Apr 5, 2025
cc5f307
fix decorator tests
Jammy2211 Apr 5, 2025
f3171fc
fix polar shapelets
Jammy2211 Apr 5, 2025
2e661b3
fix exponmential shjapelet
Jammy2211 Apr 5, 2025
01cef19
shapelet cartesian
Jammy2211 Apr 5, 2025
a563bd0
linear light profile tests
Jammy2211 Apr 5, 2025
b73c3bd
fix some of isothermal;
Jammy2211 Apr 5, 2025
fe9d3ae
fix power law core
Jammy2211 Apr 5, 2025
97761e3
fix test isothermal
Jammy2211 Apr 5, 2025
9959e74
test_isothermal_cored
Jammy2211 Apr 5, 2025
db07da1
test_power_law
Jammy2211 Apr 5, 2025
016647f
test_power_law_broken
Jammy2211 Apr 5, 2025
c786653
power_law_multopole
Jammy2211 Apr 5, 2025
b9afe00
test abstract mass
Jammy2211 Apr 5, 2025
1dfa76c
sorted out some of mass sheets
Jammy2211 Apr 5, 2025
6aba0b2
fixes to operate deflections
Jammy2211 Apr 6, 2025
8468808
more operate tests pass
Jammy2211 Apr 6, 2025
353bf56
removing evluation gris
Jammy2211 Apr 6, 2025
42728fa
all deflections test passes
Jammy2211 Apr 6, 2025
a9f1a26
remove input delections
Jammy2211 Apr 6, 2025
bbe7a97
fix all mass_sheets
Jammy2211 Apr 6, 2025
c2eda8a
point mass
Jammy2211 Apr 6, 2025
8910f94
serisc radial gradient sorted
Jammy2211 Apr 6, 2025
7d0a358
sersic gradient tests pass
Jammy2211 Apr 6, 2025
9d1f0ff
seris ctestd fixed escept one
Jammy2211 Apr 6, 2025
788e57e
gaussian tests mass prass
Jammy2211 Apr 6, 2025
d9989fa
yest chameialeon
Jammy2211 Apr 6, 2025
187a291
stellar tests pass
Jammy2211 Apr 7, 2025
fb082a1
all mass profiles pass except dark
Jammy2211 Apr 7, 2025
a967fbb
NFW tests pass
Jammy2211 Apr 7, 2025
fd8b550
test_light_and_mass_profiles
Jammy2211 Apr 7, 2025
a1b5905
remove annoying stuff
Jammy2211 Apr 7, 2025
7552c5b
test_image operate all pass
Jammy2211 Apr 7, 2025
b25638c
all test_Galaxy passes
Jammy2211 Apr 7, 2025
c0920c7
test_galaxies
Jammy2211 Apr 7, 2025
01df7b7
test_stellar_dark_Decomp
Jammy2211 Apr 7, 2025
8c290aa
galaxy plottes
Jammy2211 Apr 7, 2025
f4855bb
all of test_to_inversion passes
Jammy2211 Apr 7, 2025
5725dd7
fix another test
Jammy2211 Apr 7, 2025
e1aa7bf
fix test_fit_imaging
Jammy2211 Apr 7, 2025
5595d07
test_fit_interferometger
Jammy2211 Apr 7, 2025
a24aa18
test_simulator
Jammy2211 Apr 7, 2025
0ff3798
test_simulate_and_fit_imaging.py
Jammy2211 Apr 8, 2025
3cc37ef
tesyt_result_imaging
Jammy2211 Apr 8, 2025
fe3e9ed
test_simulate_and_fit_interferometer.py
Jammy2211 Apr 8, 2025
d17d1d3
fix unit test in quantity
Jammy2211 Apr 8, 2025
bc9672d
fix geometry profiles
Jammy2211 Apr 8, 2025
0e206f6
fix plot tests
Jammy2211 Apr 8, 2025
e77de0c
black
Jammy2211 Apr 8, 2025
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
75 changes: 0 additions & 75 deletions autogalaxy/config/grids.yaml

This file was deleted.

1 change: 0 additions & 1 deletion autogalaxy/config/notation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ label:
SMBH: smbh
Redshift: z
Regularization: reg
InputDeflections: defl
label_format:
format:
sigma: '{:.4f}'
Expand Down
19 changes: 11 additions & 8 deletions autogalaxy/galaxy/galaxy.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from typing import Dict, List, Optional, Type, Union

import jax.numpy as jnp
import numpy as np

from autoconf.dictable import instance_as_dict, to_dict

import autoarray as aa
import autofit as af
from autoconf.dictable import instance_as_dict, to_dict

from autogalaxy import exc
from autogalaxy.operate.deflections import OperateDeflections
Expand Down Expand Up @@ -228,7 +230,7 @@ def image_2d_from(
):
return sum(self.image_2d_list_from(grid=grid, operated_only=operated_only))

return np.zeros((grid.shape[0],))
return jnp.zeros((grid.shape[0],))

@aa.grid_dec.to_projected
def image_1d_from(self, grid: aa.type.Grid2DLike) -> np.ndarray:
Expand Down Expand Up @@ -261,7 +263,7 @@ def image_1d_from(self, grid: aa.type.Grid2DLike) -> np.ndarray:

return sum(image_1d_list)

return np.zeros((grid.shape[0],))
return jnp.zeros((grid.shape[0],))

@aa.grid_dec.to_vector_yx
def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> np.ndarray:
Expand Down Expand Up @@ -289,7 +291,7 @@ def deflections_yx_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> np.ndarr
self.cls_list_from(cls=MassProfile),
)
)
return np.zeros((grid.shape[0], 2))
return jnp.zeros((grid.shape[0], 2))

@aa.grid_dec.to_array
def convergence_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> np.ndarray:
Expand All @@ -316,7 +318,7 @@ def convergence_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> np.ndarray:
self.cls_list_from(cls=MassProfile),
)
)
return np.zeros((grid.shape[0],))
return jnp.zeros((grid.shape[0],))

@aa.grid_dec.to_grid
def traced_grid_2d_from(self, grid: aa.type.Grid2DLike) -> aa.type.Grid2DLike:
Expand Down Expand Up @@ -355,6 +357,7 @@ def convergence_1d_from(self, grid: aa.type.Grid1D2DLike) -> np.ndarray:
convergence_1d_list = []

for mass_profile in self.cls_list_from(cls=MassProfile):

grid_radial = self.grid_radial_from(
grid=grid, centre=mass_profile.centre, angle=mass_profile.angle
)
Expand All @@ -365,7 +368,7 @@ def convergence_1d_from(self, grid: aa.type.Grid1D2DLike) -> np.ndarray:

return sum(convergence_1d_list)

return np.zeros((grid.shape[0],))
return jnp.zeros((grid.shape[0],))

@aa.grid_dec.to_array
def potential_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> np.ndarray:
Expand All @@ -392,7 +395,7 @@ def potential_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> np.ndarray:
self.cls_list_from(cls=MassProfile),
)
)
return np.zeros((grid.shape[0],))
return jnp.zeros((grid.shape[0],))

@aa.grid_dec.to_projected
def potential_1d_from(self, grid: aa.type.Grid2DLike) -> np.ndarray:
Expand Down Expand Up @@ -425,7 +428,7 @@ def potential_1d_from(self, grid: aa.type.Grid2DLike) -> np.ndarray:

return sum(potential_1d_list)

return np.zeros((grid.shape[0],))
return jnp.zeros((grid.shape[0],))

@property
def half_light_radius(self):
Expand Down
1 change: 1 addition & 0 deletions autogalaxy/imaging/fit_imaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ def galaxies_to_inversion(self) -> GalaxiesToInversion:
noise_map=self.noise_map,
grids=self.grids,
psf=self.dataset.psf,
convolver=self.dataset.convolver,
w_tilde=self.w_tilde,
)

Expand Down
Loading
Loading