Merge pull request #374 from Jammy2211/feature/w_tilde_via_dataset

Feature/w tilde via dataset

Author: Jammy2211

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)