added subplot of plane images to TracerPlotter

Author: Jammy2211

autolens/config/visualize/plots.ini

@@ -2,6 +2,7 @@
 all_at_end_png=False
 all_at_end_fits=False
 subplot_ray_tracing=True
+subplot_plane_images=True
 image=False
 source_plane_image=False
 convergence=False

autolens/imaging/model/analysis.py

@@ -15,7 +15,6 @@
 
 from autolens.lens.model.analysis import AnalysisDataset
 from autolens.lens.model.preloads import Preloads
-from autolens.imaging.model.maker import FitImagingMaker
 from autolens.imaging.model.result import ResultImaging
 from autolens.imaging.model.visualizer import VisualizerImaging
 from autolens.imaging.fit_imaging import FitImaging
@@ -55,61 +54,6 @@ def modify_before_fit(self, paths: af.DirectoryPaths, model: af.AbstractPriorMod
 
         return self
 
-    def check_and_replace_hyper_images(self, paths: af.DirectoryPaths):
-
-        try:
-            hyper_model_image = paths.load_object("hyper_model_image")
-
-            if np.max(abs(hyper_model_image - self.hyper_model_image)) > 1e-8:
-
-                logger.info(
-                    "ANALYSIS - Hyper image loaded from pickle different to that set in Analysis class."
-                    "Overwriting hyper images with values loaded from pickles."
-                )
-
-                self.hyper_model_image = hyper_model_image
-
-                hyper_galaxy_image_path_dict = paths.load_object(
-                    "hyper_galaxy_image_path_dict"
-                )
-                self.hyper_galaxy_image_path_dict = hyper_galaxy_image_path_dict
-
-        except (FileNotFoundError, AttributeError):
-            pass
-
-    def set_preloads(self, paths: af.DirectoryPaths, model: af.AbstractPriorModel):
-
-        try:
-            os.makedirs(paths.profile_path)
-        except FileExistsError:
-            pass
-
-        fit_maker = FitImagingMaker(model=model, fit_func=self.fit_imaging_for_instance)
-
-        fit_0 = fit_maker.fit_via_model(unit_value=0.45)
-        fit_1 = fit_maker.fit_via_model(unit_value=0.55)
-
-        if fit_0 is None or fit_1 is None:
-            self.preloads = Preloads(failed=True)
-        else:
-            self.preloads = Preloads.setup_all_via_fits(fit_0=fit_0, fit_1=fit_1)
-            self.check_preloads(fit=fit_0)
-
-        self.preloads.output_info_to_summary(file_path=paths.profile_path)
-
-    def check_preloads(self, fit):
-
-        self.preloads.check_via_fit(fit=fit)
-
-    def modify_after_fit(
-        self, paths: af.DirectoryPaths, model: af.AbstractPriorModel, result: af.Result
-    ):
-
-        self.output_or_check_figure_of_merit_sanity(paths=paths, result=result)
-        self.preloads.reset_all()
-
-        return self
-
     def log_likelihood_function(self, instance):
         """
         Determine the fit of a lens galaxy and source galaxy to the imaging in this lens.
@@ -194,6 +138,10 @@ def fit_imaging_for_tracer(
             profiling_dict=profiling_dict,
         )
 
+    @property
+    def fit_func(self):
+        return self.fit_imaging_for_instance
+
     def profile_log_likelihood_function(
         self, instance, paths: Optional[af.DirectoryPaths] = None
     ):

autolens/imaging/model/maker.py

@@ -28,6 +28,16 @@ def __init__(
             The tracer, which describes the ray-tracing and strong lens configuration.
         """
 
+        self.tracer = tracer
+
+        self.hyper_background_noise = hyper_background_noise
+        self.use_hyper_scaling = use_hyper_scaling
+
+        self.settings_pixelization = settings_pixelization
+        self.settings_inversion = settings_inversion
+
+        self.preloads = preloads
+
         self.profiling_dict = profiling_dict
 
         if use_hyper_scaling:
@@ -155,3 +165,24 @@ def model_visibilities_of_planes(self):
     @property
     def total_mappers(self):
         return len(list(filter(None, self.tracer.regularization_list_of_planes)))
+
+    def refit_with_new_preloads(self, preloads, settings_inversion=None):
+
+        if self.profiling_dict is not None:
+            profiling_dict = {}
+        else:
+            profiling_dict = None
+
+        if settings_inversion is None:
+            settings_inversion = self.settings_inversion
+
+        return FitInterferometer(
+            interferometer=self.interferometer,
+            tracer=self.tracer,
+            hyper_background_noise=self.hyper_background_noise,
+            use_hyper_scaling=self.use_hyper_scaling,
+            settings_pixelization=self.settings_pixelization,
+            settings_inversion=settings_inversion,
+            preloads=preloads,
+            profiling_dict=profiling_dict,
+        )

autolens/interferometer/fit_interferometer.py

@@ -1,4 +1,5 @@
 from astropy import cosmology as cosmo
+import logging
 
 from autoconf import conf
 import autofit as af
@@ -8,12 +9,16 @@
 from autolens.lens.model.analysis import AnalysisDataset
 from autolens.lens.model.preloads import Preloads
 from autolens.interferometer.model.result import ResultInterferometer
-from autolens.lens.model.visualizer import Visualizer
+from autolens.interferometer.model.visualizer import VisualizerInterferometer
 from autolens.interferometer.fit_interferometer import FitInterferometer
 from autolens.lens.model.settings import SettingsLens
 
 from autolens import exc
 
+logger = logging.getLogger(__name__)
+
+logger.setLevel(level="INFO")
+
 
 class AnalysisInterferometer(AnalysisDataset):
     def __init__(
@@ -50,6 +55,29 @@ def __init__(
     def interferometer(self):
         return self.dataset
 
+    def modify_before_fit(self, paths: af.DirectoryPaths, model: af.AbstractPriorModel):
+
+        self.check_and_replace_hyper_images(paths=paths)
+
+        if not paths.is_complete:
+
+            visualizer = VisualizerInterferometer(visualize_path=paths.image_path)
+
+            visualizer.visualize_interferometer(interferometer=self.interferometer)
+
+            visualizer.visualize_hyper_images(
+                hyper_galaxy_image_path_dict=self.hyper_galaxy_image_path_dict,
+                hyper_model_image=self.hyper_model_image,
+            )
+
+            logger.info(
+                "PRELOADS - Setting up preloads, may take a few minutes for fits using an inversion."
+            )
+
+            self.set_preloads(paths=paths, model=model)
+
+        return self
+
     def set_hyper_dataset(self, result):
 
         super().set_hyper_dataset(result=result)
@@ -170,6 +198,10 @@ def fit_interferometer_for_tracer(
             preloads=preloads,
         )
 
+    @property
+    def fit_func(self):
+        return self.fit_interferometer_for_instance
+
     def stochastic_log_evidences_for_instance(self, instance):
 
         instance = self.associate_hyper_images(instance=instance)
@@ -222,19 +254,12 @@ def stochastic_log_evidences_for_instance(self, instance):
 
     def visualize(self, paths: af.DirectoryPaths, instance, during_analysis):
 
-        self.associate_hyper_images(instance=instance)
-        tracer = self.tracer_for_instance(instance=instance)
+        instance = self.associate_hyper_images(instance=instance)
 
-        hyper_background_noise = self.hyper_background_noise_for_instance(
-            instance=instance
-        )
+        fit = self.fit_interferometer_for_instance(instance=instance)
 
-        fit = self.fit_interferometer_for_tracer(
-            tracer=tracer, hyper_background_noise=hyper_background_noise
-        )
+        visualizer = VisualizerInterferometer(visualize_path=paths.image_path)
 
-        visualizer = Visualizer(visualize_path=paths.image_path)
-        visualizer.visualize_interferometer(interferometer=self.interferometer)
         visualizer.visualize_fit_interferometer(
             fit=fit, during_analysis=during_analysis
         )
@@ -246,16 +271,14 @@ def visualize(self, paths: af.DirectoryPaths, instance, during_analysis):
                 inversion=fit.inversion, during_analysis=during_analysis
             )
 
-        visualizer.visualize_hyper_images(
-            hyper_galaxy_image_path_dict=self.hyper_galaxy_image_path_dict,
-            hyper_model_image=self.hyper_model_image,
-            tracer=tracer,
-        )
+        visualizer.visualize_contribution_maps(tracer=fit.tracer)
 
         if visualizer.plot_fit_no_hyper:
-
             fit = self.fit_interferometer_for_tracer(
-                tracer=tracer, hyper_background_noise=None, use_hyper_scalings=False
+                tracer=fit.tracer,
+                hyper_background_noise=None,
+                use_hyper_scalings=False,
+                preload_overwrite=Preloads(use_w_tilde=False),
             )
 
             visualizer.visualize_fit_interferometer(