black

Author: Jammy2211

autoarray/config/visualize/plots.yaml

@@ -3,11 +3,11 @@
 # For example, if `plots: fit: subplot_fit=True``, the ``fit_dataset.png`` subplot file will 
 # be plotted every time visualization is performed.
 
-dataset:                                   # Settings for plots of all datasets (e.g. ImagingPlotter, InterferometerPlotter).
+dataset:                                   # Settings for plots of all datasets (e.g. Imaging, Interferometer).
   subplot_dataset: true                    # Plot subplot containing all dataset quantities (e.g. the data, noise-map, etc.)?
-imaging:                                   # Settings for plots of imaging datasets (e.g. ImagingPlotter)
+imaging:                                   # Settings for plots of imaging datasets (e.g. Imaging)
    psf: false
-fit:                                       # Settings for plots of all fits (e.g. FitImagingPlotter, FitInterferometerPlotter).
+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.)?
   data: false                              # Plot individual plots of the data?
@@ -18,8 +18,8 @@ fit:                                       # Settings for plots of all fits (e.g
   normalized_residual_map: false           # Plot individual plots of the normalized-residual-map?
   chi_squared_map: false                   # Plot individual plots of the chi-squared-map?
   residual_flux_fraction: false            # Plot individual plots of the residual_flux_fraction?
-fit_imaging: {}                            # Settings for plots of fits to imaging datasets (e.g. FitImagingPlotter).
-inversion:                                 # Settings for plots of inversions (e.g. InversionPlotter).
+fit_imaging: {}                            # Settings for plots of fits to imaging datasets (e.g. FitImaging).
+inversion:                                 # Settings for plots of inversions (e.g. Inversion).
   subplot_inversion: true                  # Plot subplot of all quantities in each inversion (e.g. reconstrucuted image, reconstruction)?
   subplot_mappings: false                  # Plot subplot of the image-to-source pixels mappings of each pixelization?
   data_subtracted: false                   # Plot individual plots of the data with the other inversion linear objects subtracted?
@@ -30,6 +30,6 @@ inversion:                                 # Settings for plots of inversions (e
   reconstructed_operated_data: false               # Plot image of the reconstructed data (e.g. in the image-plane)?
   reconstruction: false                    # Plot the reconstructed inversion (e.g. the pixelization's mesh in the source-plane)?
   regularization_weights: false            # Plot the effective regularization weight of every inversion mesh pixel?
-fit_interferometer:                        # Settings for plots of fits to interferometer datasets (e.g. FitInterferometerPlotter).
+fit_interferometer:                        # Settings for plots of fits to interferometer datasets (e.g. FitInterferometer).
   subplot_fit_dirty_images: false          # Plot subplot of the dirty-images of all interferometer datasets?
   subplot_fit_real_space: false            # Plot subplot of the real-space images of all interferometer datasets?

autoarray/inversion/mesh/interpolator/delaunay.py

@@ -91,6 +91,7 @@ def jax_delaunay(points, query_points, areas_factor=0.5):
         ),
         points,
         query_points,
+        vmap_method="sequential",
     )
 
 
@@ -248,6 +249,7 @@ def jax_delaunay_matern(points, query_points):
         (points_shape, simplices_padded_shape, mappings_shape),
         points,
         query_points,
+        vmap_method="sequential",
     )
 
 

autoarray/operators/transformer.py

@@ -356,6 +356,7 @@ def visibilities_from_jax(self, image: np.ndarray) -> np.ndarray:
             lambda img: self._pynufft_forward_numpy(img),
             result_shape,
             image,
+            vmap_method="sequential",
         )
 
     def visibilities_from(self, image, xp=np):

autoarray/plot/output.py

@@ -161,11 +161,13 @@ def savefig(self, filename: str, output_path: str, format: str):
                 pad_inches=0.1,
             )
         except ValueError as e:
-            logger.info(f"""
+            logger.info(
+                f"""
                 Failed to output figure as a .{format} or .fits due to the following error:
 
                 {e}
-            """)
+            """
+            )
 
     def to_figure(
         self, structure: Optional[Structure], auto_filename: Optional[str] = None

autoarray/structures/arrays/rgb.py

@@ -10,7 +10,7 @@ def __init__(self, values, mask):
         the same functionality as `Array2D` objects.
 
         By passing an RGB image to this class, the following visualization functionality is used when the RGB
-        image is used in `Plotter` objects:
+        image is used in plotting:
 
         - The RGB image is plotted using the `imshow` function of Matplotlib.
         - Functionality which sets the scale of the axis, zooms the image, and sets the axis limits is used.

test_autoarray/conftest.py

@@ -30,6 +30,7 @@ def make_plot_patch(monkeypatch):
     plot_patch = PlotPatch()
     monkeypatch.setattr(pyplot, "savefig", plot_patch)
     from matplotlib.figure import Figure
+
     monkeypatch.setattr(Figure, "savefig", plot_patch)
     return plot_patch
 

test_autoarray/fit/plot/test_fit_interferometer_plotters.py

@@ -36,7 +36,10 @@ def test__fit_quantities_are_output(fit_interferometer_7, plot_path, plot_patch)
         output_format="png",
         plot_axis_type="scatter",
     )
-    assert path.join(plot_path, "real_residual_map_vs_uv_distances.png") in plot_patch.paths
+    assert (
+        path.join(plot_path, "real_residual_map_vs_uv_distances.png")
+        in plot_patch.paths
+    )
 
     aplt.plot_yx_1d(
         y=np.real(fit_interferometer_7.chi_squared_map),
@@ -46,7 +49,10 @@ def test__fit_quantities_are_output(fit_interferometer_7, plot_path, plot_patch)
         output_format="png",
         plot_axis_type="scatter",
     )
-    assert path.join(plot_path, "real_chi_squared_map_vs_uv_distances.png") in plot_patch.paths
+    assert (
+        path.join(plot_path, "real_chi_squared_map_vs_uv_distances.png")
+        in plot_patch.paths
+    )
 
     aplt.plot_yx_1d(
         y=np.imag(fit_interferometer_7.chi_squared_map),
@@ -56,7 +62,10 @@ def test__fit_quantities_are_output(fit_interferometer_7, plot_path, plot_patch)
         output_format="png",
         plot_axis_type="scatter",
     )
-    assert path.join(plot_path, "imag_chi_squared_map_vs_uv_distances.png") in plot_patch.paths
+    assert (
+        path.join(plot_path, "imag_chi_squared_map_vs_uv_distances.png")
+        in plot_patch.paths
+    )
 
     aplt.plot_array_2d(
         array=fit_interferometer_7.dirty_image,
@@ -92,9 +101,18 @@ def test__fit_quantities_are_output(fit_interferometer_7, plot_path, plot_patch)
     )
 
     assert path.join(plot_path, "data.png") in plot_patch.paths
-    assert path.join(plot_path, "real_chi_squared_map_vs_uv_distances.png") in plot_patch.paths
-    assert path.join(plot_path, "imag_chi_squared_map_vs_uv_distances.png") in plot_patch.paths
-    assert path.join(plot_path, "real_residual_map_vs_uv_distances.png") not in plot_patch.paths
+    assert (
+        path.join(plot_path, "real_chi_squared_map_vs_uv_distances.png")
+        in plot_patch.paths
+    )
+    assert (
+        path.join(plot_path, "imag_chi_squared_map_vs_uv_distances.png")
+        in plot_patch.paths
+    )
+    assert (
+        path.join(plot_path, "real_residual_map_vs_uv_distances.png")
+        not in plot_patch.paths
+    )
 
 
 def test__fit_sub_plots(fit_interferometer_7, plot_path, plot_patch):

test_autoarray/fit/test_fit_imaging.py

@@ -7,6 +7,7 @@
 # Helper: build the "identical model, no masking" fit used by multiple tests
 # ---------------------------------------------------------------------------
 
+
 def _make_identical_fit_no_mask():
     mask = aa.Mask2D(mask=[[False, False], [False, False]], pixel_scales=(1.0, 1.0))
     data = aa.Array2D(values=[1.0, 2.0, 3.0, 4.0], mask=mask)

test_autoarray/fit/test_fit_interferometer.py

@@ -8,6 +8,7 @@
 # Helpers
 # ---------------------------------------------------------------------------
 
+
 def _make_dataset():
     real_space_mask = aa.Mask2D(
         mask=[[False, False], [False, False]], pixel_scales=(1.0, 1.0)

test_autoarray/inversion/pixelization/mappers/test_abstract.py

@@ -133,7 +133,9 @@ def test__adaptive_pixel_signals_from___matches_util(grid_2d_7x7, image_7x7):
     assert (pixel_signals == pixel_signals_util).all()
 
 
-def test__mapped_to_source_from__delaunay_mapper__matches_mapping_matrix_util(grid_2d_7x7):
+def test__mapped_to_source_from__delaunay_mapper__matches_mapping_matrix_util(
+    grid_2d_7x7,
+):
     mesh_grid = aa.Grid2D.no_mask(
         values=[[0.1, 0.1], [1.1, 0.6], [2.1, 0.1], [0.4, 1.1], [1.1, 7.1], [2.1, 1.1]],
         shape_native=(3, 2),