visual clean up complete

Author: Jammy2211

autolens/analysis/plotter_interface.py

@@ -63,7 +63,6 @@ def should_plot(name):
             tracer=tracer,
             grid=grid,
             mat_plot_2d=mat_plot_2d,
-            include_2d=self.include_2d,
         )
 
         if should_plot("subplot_galaxies_images"):
@@ -169,7 +168,6 @@ def should_plot(name):
             image_plotter = aplt.Array2DPlotter(
                 array=image,
                 mat_plot_2d=mat_plot_2d,
-                include_2d=self.include_2d,
                 visuals_2d=visuals_2d,
             )
 

autolens/imaging/model/plotter_interface.py

@@ -40,23 +40,29 @@ def fit_imaging(
             The maximum log likelihood `FitImaging` of the non-linear search which is used to plot the fit.
         """
 
+        import time
+
         if plot_setting(section="tracer", name="subplot_tracer"):
 
             mat_plot_2d = self.mat_plot_2d_from()
 
             fit_plotter = FitImagingPlotter(
-                fit=fit, mat_plot_2d=mat_plot_2d, include_2d=self.include_2d
+                fit=fit, mat_plot_2d=mat_plot_2d
             )
 
+            start_time = time.time()
+
             fit_plotter.subplot_tracer()
 
+            print(f"Tracer subplot took {time.time() - start_time:.2f} seconds to plot.")
+
         def should_plot(name):
             return plot_setting(section=["fit", "fit_imaging"], name=name)
 
         mat_plot_2d = self.mat_plot_2d_from()
 
         fit_plotter = FitImagingPlotter(
-            fit=fit, mat_plot_2d=mat_plot_2d, include_2d=self.include_2d
+            fit=fit, mat_plot_2d=mat_plot_2d
         )
 
         plane_indexes_to_plot = [i for i in fit.tracer.plane_indexes_with_images if i != 0]
@@ -65,13 +71,20 @@ def should_plot(name):
 
             # This loop means that multiple subplot_fit objects are output for a double source plane lens.
 
+            start_time = time.time()
+
             if len(fit.tracer.planes) > 2:
                 for plane_index in plane_indexes_to_plot:
                     fit_plotter.subplot_fit(plane_index=plane_index)
             else:
                 fit_plotter.subplot_fit()
 
+            print(f"Fit subplot took {time.time() - start_time:.2f} seconds to plot.")
+
         if should_plot("subplot_fit_log10"):
+
+            start_time = time.time()
+
             try:
                 if len(fit.tracer.planes) > 2:
                     for plane_index in plane_indexes_to_plot:
@@ -81,17 +94,28 @@ def should_plot(name):
             except ValueError:
                 pass
 
+            print(f"Fit log10 subplot took {time.time() - start_time:.2f} seconds to plot.")
+
+
+        start_time = time.time()
+
         if should_plot("subplot_of_planes"):
             fit_plotter.subplot_of_planes()
 
+        print(f"Planes subplot took {time.time() - start_time:.2f} seconds to plot.")
+
         if plot_setting(section="inversion", name="subplot_mappings"):
             try:
                 fit_plotter.subplot_mappings_of_plane(plane_index=len(fit.tracer.planes) - 1)
             except IndexError:
                 pass
 
+        start_time = time.time()
+
         fits_to_fits(should_plot=should_plot, image_path=self.image_path, fit=fit)
 
+        print(f"Fits to fits took {time.time() - start_time:.2f} seconds to plot.")
+
     def fit_imaging_combined(self, fit_list: List[FitImaging]):
         """
         Output visualization of all `FitImaging` objects in a summed combined analysis, typically during or after a
@@ -119,7 +143,7 @@ def should_plot(name):
 
         fit_plotter_list = [
             FitImagingPlotter(
-                fit=fit, mat_plot_2d=mat_plot_2d, include_2d=self.include_2d
+                fit=fit, mat_plot_2d=mat_plot_2d
             )
             for fit in fit_list
         ]

autolens/imaging/model/visualizer.py

@@ -89,6 +89,9 @@ def visualize(
             via a non-linear search).
         """
 
+        import time
+        start_time = time.time()
+
         fit = analysis.fit_from(instance=instance)
 
         if analysis.positions_likelihood_list is not None:
@@ -113,11 +116,18 @@ def visualize(
             image_path=paths.image_path, title_prefix=analysis.title_prefix
         )
 
+        import time
+        start_time = time.time()
+
         try:
             plotter_interface.fit_imaging(fit=fit)
         except exc.InversionException:
             pass
 
+        print()
+        print(f"VisualizerImaging.visualize took {time.time() - start_time} seconds")
+        fff
+
         tracer = fit.tracer_linear_light_profiles_to_light_profiles
 
         zoom = ag.Zoom2D(mask=fit.mask)