Merge branch 'feature/plot-improvements-4'

Author: Jammy2211

autolens/aggregator/__init__.py

@@ -22,11 +22,11 @@
 
 from autolens.aggregator.subhalo import SubhaloAgg
 
-from autolens.aggregator.subplot import SubplotDataset as subplot_dataset
-from autolens.aggregator.subplot import SubplotTracer as subplot_tracer
-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 Dataset as subplot_dataset
+from autolens.aggregator.subplot import Tracer as subplot_tracer
+from autolens.aggregator.subplot import FitX1Plane as subplot_fit_x1_plane
+from autolens.aggregator.subplot import Fit as subplot_fit
+from autolens.aggregator.subplot import FitLog10 as subplot_fit_log10
 from autolens.aggregator.subplot import (
     FITSGalaxyImages as fits_galaxy_images,
 )

autolens/aggregator/subplot.py

@@ -41,9 +41,9 @@ class FITSFit(Enum):
     chi_squared_map = "CHI_SQUARED_MAP"
 
 
-class SubplotDataset(Enum):
+class Dataset(Enum):
     """
-    The subplots that can be extracted from the subplot_fit image.
+    The subplots that can be extracted from the fit image.
 
     The values correspond to the position of the subplot in the 4x3 grid.
     """
@@ -58,9 +58,9 @@ class SubplotDataset(Enum):
     over_sample_size_pixelization = (1, 2)
 
 
-class SubplotTracer(Enum):
+class Tracer(Enum):
     """
-    The subplots that can be extracted from the subplot_tracer image.
+    The subplots that can be extracted from the tracer image.
 
     The values correspond to the position of the subplot in the 3x3 grid.
     """
@@ -76,9 +76,9 @@ class SubplotTracer(Enum):
     deflections_x = (2, 2)
 
 
-class SubplotFitX1Plane(Enum):
+class FitX1Plane(Enum):
     """
-    The subplots that can be extracted from the subplot_fit image.
+    The subplots that can be extracted from the fit image.
 
     The values correspond to the position of the subplot in the 4x3 grid.
     """
@@ -91,9 +91,9 @@ class SubplotFitX1Plane(Enum):
     normalized_residual_map = (2, 1)
 
 
-class SubplotFit(Enum):
+class Fit(Enum):
     """
-    The subplots that can be extracted from the subplot_fit image.
+    The subplots that can be extracted from the fit image.
 
     The values correspond to the position of the subplot in the 4x3 grid.
     """
@@ -112,9 +112,9 @@ class SubplotFit(Enum):
     source_plane_image = (3, 2)
 
 
-class SubplotFitLog10(Enum):
+class FitLog10(Enum):
     """
-    The subplots that can be extracted from the subplot_fit image.
+    The subplots that can be extracted from the fit image.
 
     The values correspond to the position of the subplot in the 4x3 grid.
     """

autolens/config/visualize/plots.yaml

@@ -22,7 +22,7 @@ positions:                                 # Settings for plots with resampling
 
 fit:                                       # Settings for plots of all fits (e.g. FitImaging, FitInterferometer).
   subplot_fit: true                        # Plot subplot of all fit quantities for any dataset (e.g. the model data, residual-map, etc.)?
-  subplot_fit_log10: true                  # Plot subplot of all fit quantities for any dataset using log10 color maps (e.g. the model data, residual-map, etc.)?
+  subplot_fit_log10: false                  # Plot subplot of all fit quantities for any dataset using log10 color maps (e.g. the model data, residual-map, etc.)?
   subplot_of_planes: false                 # Plot subplot of the model-image, subtracted image and other quantities of each plane?
   subplot_galaxies_images: false              # Plot subplot of the image of each plane in the model?
   fits_fit: true                           # Output a .fits file containing the fit model data, residual map, normalized residual map and chi-squared?