Feature/w tilde via dataset

autolens/aggregator/__init__.py

@@ -27,6 +27,8 @@
 from autolens.aggregator.subplot import SubplotFitX1Plane as subplot_fit_x1_plane
 from autolens.aggregator.subplot import SubplotFit as subplot_fit
 from autolens.aggregator.subplot import SubplotFitLog10 as subplot_fit_log10
-from autolens.aggregator.subplot import FITSModelGalaxyImages as fits_model_galaxy_images
+from autolens.aggregator.subplot import (
+    FITSModelGalaxyImages as fits_model_galaxy_images,
+)
 from autolens.aggregator.subplot import FITSTracer as fits_tracer
 from autolens.aggregator.subplot import FITSFit as fits_fit

autolens/analysis/positions.py

@@ -199,4 +199,3 @@ def log_likelihood_penalty_from(
             )
 
         return penalty if max_separation > self.threshold else np.array(0.0)
-

autolens/fixtures.py

@@ -88,23 +88,20 @@ def make_fit_interferometer_x1_plane_7x7():
     return al.FitInterferometer(
         dataset=make_interferometer_7(),
         tracer=make_tracer_x1_plane_7x7(),
-        settings_inversion=aa.SettingsInversion(use_w_tilde=False),
     )
 
 
 def make_fit_interferometer_x2_plane_7x7():
     return al.FitInterferometer(
         dataset=make_interferometer_7(),
         tracer=make_tracer_x2_plane_7x7(),
-        settings_inversion=aa.SettingsInversion(use_w_tilde=False),
     )
 
 
 def make_fit_interferometer_x2_plane_inversion_7x7():
     return al.FitInterferometer(
         dataset=make_interferometer_7(),
         tracer=make_tracer_x2_plane_inversion_7x7(),
-        settings_inversion=aa.SettingsInversion(use_w_tilde=False),
     )
 
 
@@ -144,7 +141,6 @@ def make_adapt_images_7x7():
 def make_analysis_imaging_7x7():
     analysis = al.AnalysisImaging(
         dataset=make_masked_imaging_7x7(),
-        settings_inversion=aa.SettingsInversion(use_w_tilde=False),
         use_jax=False,
     )
     analysis._adapt_images = make_adapt_images_7x7()

autolens/interferometer/fit_interferometer.py

@@ -63,11 +63,6 @@ def __init__(
             Settings controlling how an inversion is fitted for example which linear algebra formalism is used.
         """
 
-        try:
-            from autoarray.inversion.inversion import inversion_util_secret
-        except ImportError:
-            settings_inversion.use_w_tilde = False
-
         self.tracer = tracer
 
         self.adapt_images = adapt_images

autolens/lens/to_inversion.py

@@ -175,7 +175,7 @@ def lp_linear_func_list_galaxy_dict(
                 blurring=traced_blurring_grids_of_planes_list[plane_index],
             )
 
-            if self.settings_inversion.use_w_tilde:
+            if self.dataset.w_tilde is not None:
                 w_tilde = self.dataset.w_tilde
             else:
                 w_tilde = None

autolens/mock.py

@@ -23,6 +23,10 @@ def deflections_between_planes_from(self, grid, xp=np, plane_i=0, plane_j=-1):
         return xp.zeros_like(grid.array)
 
     def magnification_2d_via_hessian_from(
-        self, grid, buffer: float = 0.01, deflections_func=None, xp=np,
+        self,
+        grid,
+        buffer: float = 0.01,
+        deflections_func=None,
+        xp=np,
     ) -> aa.ArrayIrregular:
         return aa.ArrayIrregular(values=xp.ones(grid.shape[0]))

autolens/point/fit/abstract.py

@@ -133,9 +133,7 @@ def magnifications_at_positions(self) -> aa.ArrayIrregular:
         """
         return abs(
             self.tracer.magnification_2d_via_hessian_from(
-                grid=self.positions,
-                deflections_func=self.deflections_func,
-                xp=self._xp
+                grid=self.positions, deflections_func=self.deflections_func, xp=self._xp
             )
         )
 

autolens/point/fit/positions/image/abstract.py

@@ -104,5 +104,5 @@ def model_data(self) -> aa.Grid2DIrregular:
             tracer=self.tracer,
             source_plane_coordinate=self.source_plane_coordinate,
             plane_redshift=self.plane_redshift,
-            remove_infinities=False
+            remove_infinities=False,
         )

autolens/point/mock/mock_solver.py

@@ -10,6 +10,6 @@ def solve(
         tracer,
         source_plane_coordinate,
         plane_redshift: Optional[float] = None,
-        remove_infinities : bool = True
+        remove_infinities: bool = True,
     ):
         return self.model_positions

autolens/point/solver/point_solver.py

@@ -60,7 +60,9 @@ def solve(
             tracer=tracer, points=kept_triangles.means
         )
 
-        solution = aa.Grid2DIrregular([pair for pair in filtered_means], xp=self._xp).array
+        solution = aa.Grid2DIrregular(
+            [pair for pair in filtered_means], xp=self._xp
+        ).array
 
         is_nan = self._xp.isnan(solution).any(axis=1)
         sentinel = self._xp.full_like(solution[0], fill_value=self._xp.inf)

autolens/point/solver/shape_solver.py

@@ -23,7 +23,7 @@ def __init__(
         pixel_scale_precision: float,
         magnification_threshold=0.1,
         neighbor_degree: int = 1,
-        xp = np
+        xp=np,
     ):
         """
         Determine the image plane coordinates that are traced to be a source plane coordinate.
@@ -144,9 +144,13 @@ def for_limits_and_scale(
         """
 
         if xp.__name__.startswith("jax"):
-            from autoarray.structures.triangles.coordinate_array import CoordinateArrayTriangles as triangle_cls
+            from autoarray.structures.triangles.coordinate_array import (
+                CoordinateArrayTriangles as triangle_cls,
+            )
         else:
-            from autoarray.structures.triangles.coordinate_array_np import CoordinateArrayTrianglesNp as triangle_cls
+            from autoarray.structures.triangles.coordinate_array_np import (
+                CoordinateArrayTrianglesNp as triangle_cls,
+            )
 
         initial_triangles = triangle_cls.for_limits_and_scale(
             y_min=y_min,
@@ -196,10 +200,7 @@ def _plane_grid(
             plane_index = tracer.plane_index_via_redshift_from(redshift=plane_redshift)
 
         deflections = tracer.deflections_between_planes_from(
-            grid=grid,
-            plane_i=0,
-            plane_j=plane_index,
-            xp=self._xp
+            grid=grid, plane_i=0, plane_j=plane_index, xp=self._xp
         )
         # noinspection PyTypeChecker
         return grid.grid_2d_via_deflection_grid_from(deflection_grid=deflections)
@@ -265,9 +266,7 @@ def _filter_low_magnification(
         """
         points = self._xp.array(points)
         magnifications = tracer.magnification_2d_via_hessian_from(
-            grid=aa.Grid2DIrregular(points).array,
-            buffer=self.scale,
-            xp=self._xp
+            grid=aa.Grid2DIrregular(points).array, buffer=self.scale, xp=self._xp
         )
         mask = self._xp.abs(magnifications.array) > self.magnification_threshold
         return self._xp.where(mask[:, None], points, self._xp.nan)

test_autolens/imaging/test_fit_imaging.py

@@ -559,7 +559,7 @@ def test__galaxy_model_image_dict(masked_imaging_7x7):
 
     masked_imaging_7x7.data[0] = 3.0
 
-    fit = al.FitImaging(dataset=masked_imaging_7x7, tracer=tracer, settings_inversion=al.SettingsInversion(use_w_tilde=False))
+    fit = al.FitImaging(dataset=masked_imaging_7x7, tracer=tracer)
 
     assert fit.galaxy_model_image_dict[g0] == pytest.approx(
         blurred_image_2d_list[0].array, 1.0e-4
@@ -674,7 +674,7 @@ def test__model_images_of_planes_list(masked_imaging_7x7_sub_2):
         galaxies=[g0, g1_linear, galaxy_pix_0, galaxy_pix_1]
     )
 
-    fit = al.FitImaging(dataset=masked_imaging_7x7_sub_2, tracer=tracer, settings_inversion=al.SettingsInversion(use_w_tilde=False))
+    fit = al.FitImaging(dataset=masked_imaging_7x7_sub_2, tracer=tracer)
 
     assert fit.model_images_of_planes_list[0] == pytest.approx(
         fit.galaxy_model_image_dict[g0].array, 1.0e-4
@@ -827,7 +827,6 @@ def test__total_mappers(masked_imaging_7x7):
     fit = al.FitImaging(
         dataset=masked_imaging_7x7,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.total_mappers == 3

test_autolens/imaging/test_simulate_and_fit_imaging.py

@@ -179,7 +179,6 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_agree_with_standa
     fit_linear = al.FitImaging(
         dataset=masked_dataset,
         tracer=tracer_linear,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit_linear.inversion.reconstruction == pytest.approx(
@@ -286,7 +285,6 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization(
     fit_linear = al.FitImaging(
         dataset=masked_dataset,
         tracer=tracer_linear,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit_linear.inversion.reconstruction == pytest.approx(
@@ -326,7 +324,6 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization(
         dataset=masked_dataset,
         tracer=tracer_linear,
         settings_inversion=al.SettingsInversion(
-            use_w_tilde=False,
             use_positive_only_solver=True,
         ),
         preloads=al.Preloads(
@@ -416,7 +413,6 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
     fit_linear = al.FitImaging(
         dataset=masked_dataset,
         tracer=tracer_linear,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit_linear.inversion.reconstruction == pytest.approx(
@@ -460,7 +456,6 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
         dataset=masked_dataset,
         tracer=tracer_linear,
         settings_inversion=al.SettingsInversion(
-            use_w_tilde=False,
             use_positive_only_solver=True,
             force_edge_pixels_to_zeros=True
         ),
@@ -572,13 +567,13 @@ def test__simulate_imaging_data_and_fit__complex_fit_compare_mapping_matrix_w_ti
     fit_mapping = al.FitImaging(
         dataset=masked_dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
+    masked_dataset_w_tilde = masked_dataset.apply_w_tilde()
+
     fit_w_tilde = al.FitImaging(
-        dataset=masked_dataset,
+        dataset=masked_dataset_w_tilde,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=True),
     )
 
     assert fit_mapping.inversion.curvature_matrix == pytest.approx(

test_autolens/interferometer/test_fit_interferometer.py

@@ -68,7 +68,6 @@ def test__fit_figure_of_merit(interferometer_7):
     fit = al.FitInterferometer(
         dataset=interferometer_7,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.perform_inversion is True
@@ -90,7 +89,6 @@ def test__fit_figure_of_merit(interferometer_7):
     fit = al.FitInterferometer(
         dataset=interferometer_7,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.perform_inversion is True
@@ -154,7 +152,6 @@ def test___galaxy_model_image_dict(interferometer_7, interferometer_7_grid):
     fit = al.FitInterferometer(
         dataset=interferometer_7_grid,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     traced_grid_2d_list_from = tracer.traced_grid_2d_list_from(
@@ -181,7 +178,6 @@ def test___galaxy_model_image_dict(interferometer_7, interferometer_7_grid):
     fit = al.FitInterferometer(
         dataset=interferometer_7_grid,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.galaxy_model_image_dict[g0_linear][4] == pytest.approx(
@@ -207,7 +203,6 @@ def test___galaxy_model_image_dict(interferometer_7, interferometer_7_grid):
     fit = al.FitInterferometer(
         dataset=interferometer_7,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert (fit.galaxy_model_image_dict[g0_no_light].native == np.zeros((7, 7))).all()
@@ -224,7 +219,6 @@ def test___galaxy_model_image_dict(interferometer_7, interferometer_7_grid):
     fit = al.FitInterferometer(
         dataset=interferometer_7_grid,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.galaxy_model_image_dict[g0] == pytest.approx(g0_image.array, 1.0e-4)

test_autolens/interferometer/test_simulate_and_fit_interferometer.py

@@ -72,7 +72,6 @@ def test__perfect_fit__chi_squared_0():
     fit = al.FitInterferometer(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.chi_squared == pytest.approx(0.0)
@@ -95,7 +94,6 @@ def test__perfect_fit__chi_squared_0():
     fit = al.FitInterferometer(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
     assert abs(fit.chi_squared) < 1.0e-4
 
@@ -138,7 +136,6 @@ def test__simulate_interferometer_data_and_fit__known_likelihood():
     fit = al.FitInterferometer(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit.figure_of_merit == pytest.approx(-5.433894158056919, 1.0e-2)
@@ -181,7 +178,6 @@ def test__simulate_interferometer_data_and_fit__linear_light_profiles_agree_with
     fit = al.FitInterferometer(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     lens_galaxy_linear = al.Galaxy(
@@ -201,7 +197,6 @@ def test__simulate_interferometer_data_and_fit__linear_light_profiles_agree_with
     fit_linear = al.FitInterferometer(
         dataset=dataset,
         tracer=tracer_linear,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit_linear.inversion.reconstruction == pytest.approx(
@@ -301,7 +296,6 @@ def test__simulate_interferometer_data_and_fit__linear_light_profiles_and_pixeli
     fit_linear = al.FitInterferometer(
         dataset=dataset,
         tracer=tracer_linear,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     assert fit_linear.inversion.reconstruction == pytest.approx(

test_autolens/lens/test_to_inversion.py

@@ -489,7 +489,6 @@ def test__inversion_imaging_from(grid_2d_7x7, masked_imaging_7x7):
     tracer_to_inversion = al.TracerToInversion(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     inversion = tracer_to_inversion.inversion
@@ -508,7 +507,6 @@ def test__inversion_imaging_from(grid_2d_7x7, masked_imaging_7x7):
     tracer_to_inversion = al.TracerToInversion(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     inversion = tracer_to_inversion.inversion
@@ -544,7 +542,6 @@ def test__inversion_interferometer_from(grid_2d_7x7, interferometer_7):
     tracer_to_inversion = al.TracerToInversion(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     inversion = tracer_to_inversion.inversion
@@ -563,7 +560,6 @@ def test__inversion_interferometer_from(grid_2d_7x7, interferometer_7):
     tracer_to_inversion = al.TracerToInversion(
         dataset=dataset,
         tracer=tracer,
-        settings_inversion=al.SettingsInversion(use_w_tilde=False),
     )
 
     inversion = tracer_to_inversion.inversion