git push

Merge branch 'feature/jax_w_tilde_preload'

Author: Jammy2211

CITATIONS.rst

@@ -22,7 +22,7 @@ If you use decomposed mass models (e.g. stellar mass models like an ``Sersic`` o
 an ``NFW``) please cite the following paper https://arxiv.org/abs/2106.11464 under
 citation key ``Oguri2021``. Our deflection angle calculations are based on this method.
 
-If you specifically use a decomposed mass model with the ``GeneralizedNFW`` please cite the following paper https://academic.oup.com/mnras/article/488/1/1387/5526256 under
+If you specifically use a decomposed mass model with the ``gNFW`` please cite the following paper https://academic.oup.com/mnras/article/488/1/1387/5526256 under
 citation key ``Anowar2019``.
 
 The citations.bib file above also includes my work on `using strong lensing to study galaxy structure

autolens/__init__.py

@@ -1,7 +1,9 @@
 from autoconf import jax_wrapper
 from autoconf.dictable import from_dict, from_json, output_to_json, to_dict
 from autoarray import preprocess
-from autoarray.dataset.interferometer.w_tilde import load_curvature_preload_if_compatible
+from autoarray.dataset.interferometer.w_tilde import (
+    load_curvature_preload_if_compatible,
+)
 from autoarray.dataset.imaging.w_tilde import WTildeImaging
 from autoarray.dataset.imaging.dataset import Imaging
 from autoarray.dataset.interferometer.dataset import (
@@ -40,6 +42,9 @@
 from autoarray.structures.grids.uniform_2d import Grid2D
 from autoarray.structures.grids.irregular_2d import Grid2DIrregular
 from autoarray.structures.mesh.rectangular_2d import Mesh2DRectangular
+from autoarray.structures.mesh.rectangular_2d_uniform import (
+    Mesh2DRectangularUniform,
+)  # noqa
 from autoarray.structures.mesh.delaunay_2d import Mesh2DDelaunay
 from autoarray.structures.triangles.shape import Circle
 from autoarray.structures.triangles.shape import Triangle

autolens/exc.py

@@ -32,7 +32,7 @@ class PixelizationException(af.exc.FitException):
     """
     Raises exceptions associated with the `inversion/pixelization` modules and `Pixelization` classes.
 
-    For example if a `RectangularMagnification` mesh has dimensions below 3x3.
+    For example if a `RectangularAdaptDensity` mesh has dimensions below 3x3.
 
     This exception overwrites `autoarray.exc.PixelizationException` in order to add a `FitException`. This means that
     if this exception is raised during a model-fit in the analysis class's `log_likelihood_function` that model

autolens/interferometer/simulator.py

@@ -96,7 +96,9 @@ def via_deflections_and_galaxies_from(
 
         return self.via_image_from(image=image)
 
-    def via_source_image_from(self, tracer : Tracer, grid : aa.type.Grid2DLike, source_image : aa.Array2D) -> aa.Imaging:
+    def via_source_image_from(
+        self, tracer: Tracer, grid: aa.type.Grid2DLike, source_image: aa.Array2D
+    ) -> aa.Imaging:
         """
         Simulate an `Interferometer` dataset from an input image of a source galaxy.
 
@@ -127,8 +129,7 @@ def via_source_image_from(self, tracer : Tracer, grid : aa.type.Grid2DLike, sour
         """
 
         image = tracer.image_2d_via_input_plane_image_from(
-            grid=grid,
-            plane_image=source_image
+            grid=grid, plane_image=source_image
         )
 
-        return self.via_image_from(image=image)
+        return self.via_image_from(image=image)

autolens/lens/subhalo.py

@@ -367,7 +367,10 @@ def figure_figures_of_merit_grid(
             max_value = np.round(np.nanmax(array_overlay), 2)
             fit_plotter.set_title(label=f"Image {max_value}")
 
-        fit_plotter.figures_2d_of_planes(plane_index=-1, subtracted_image=True)
+        try:
+            fit_plotter.figures_2d_of_planes(plane_index=-1, subtracted_image=True)
+        except AttributeError:
+            pass
 
         if reset_filename:
             self.set_filename(filename=None)
@@ -384,10 +387,15 @@ def figure_mass_grid(self):
 
         array_overlay = self.result.subhalo_mass_array
 
-        visuals_2d = self.visuals_2d + self.visuals_2d.__class__(
-            array_overlay=array_overlay,
-            mass_profile_centres=self.result.subhalo_centres_grid,
-        )
+        try:
+            visuals_2d = self.visuals_2d + self.visuals_2d.__class__(
+                array_overlay=array_overlay,
+                mass_profile_centres=self.result.subhalo_centres_grid,
+            )
+        except TypeError:
+            visuals_2d = self.visuals_2d + self.visuals_2d.__class__(
+                array_overlay=array_overlay,
+            )
 
         self.update_mat_plot_array_overlay(evidence_max=np.max(array_overlay))
         self.mat_plot_2d.colorbar.manual_log10 = True

docs/api/pixelization.rst

@@ -46,7 +46,7 @@ Mesh [ag.mesh]
    :template: custom-class-template.rst
    :recursive:
 
-   RectangularMagnification
+   RectangularAdaptDensity
    Delaunay
    Voronoi
    Voronoi

docs/general/citations.rst

@@ -30,7 +30,7 @@ If you use decomposed mass models (e.g. stellar mass models like an ``Sersic`` o
 an ``NFW``) please cite the following paper https://arxiv.org/abs/2106.11464 under
 citation key ``Oguri2021``. Our deflection angle calculations are based on this method.
 
-If you specifically use a decomposed mass model with the ``GeneralizedNFW`` please cite the following paper https://academic.oup.com/mnras/article/488/1/1387/5526256 under
+If you specifically use a decomposed mass model with the ``gNFW`` please cite the following paper https://academic.oup.com/mnras/article/488/1/1387/5526256 under
 citation key ``Anowar2019``.
 
 Science Papers

test_autolens/config/priors/pixelizations.yaml

@@ -50,7 +50,7 @@ delaunay.DelaunayMagnification:
     width_modifier:
       type: Absolute
       value: 8.0
-rectangular.RectangularMagnification:
+rectangular.RectangularAdaptDensity:
   shape_0:
     limits:
       lower: 3.0