update FFT padding defaults to go odd x odd image if FFT not used

Author: Jammy2211

autoarray/config/general.yaml

@@ -2,6 +2,8 @@ jax:
   use_jax: true                       # If True, uses JAX internally, whereas False uses normal Numpy.
 fits:
   flip_for_ds9: false                 # If True, the image is flipped before output to a .fits file, which is useful for viewing in DS9.
+psf:
+  use_fft_default: true              # If True, PSFs are convolved using FFTs by default, which is faster and uses less memory in all cases except for very small PSFs, False uses direct convolution.
 inversion:
   check_reconstruction: true          # If True, the inversion's reconstruction is checked to ensure the solution of a meshs's mapper is not an invalid solution where the values are all the same.
   use_positive_only_solver: true      # If True, inversion's use a positive-only linear algebra solver by default, which is slower but prevents unphysical negative values in the reconstructed solutuion.

autoarray/dataset/imaging/dataset.py

@@ -4,6 +4,7 @@
 from typing import Optional, Union
 
 from autoconf import cached_property
+from autoconf import instance
 
 from autoarray.dataset.abstract.dataset import AbstractDataset
 from autoarray.dataset.grids import GridsDataset
@@ -95,6 +96,10 @@ def __init__(
 
         if psf is not None and not disable_fft_pad and data.mask.shape != fft_shape:
 
+            # If using real-space convolution instead of FFT, enforce odd-odd shapes
+            if not psf.use_fft:
+                fft_shape = tuple(s + 1 if s % 2 == 0 else s for s in fft_shape)
+
             logger.info(
                 f"Imaging data has been trimmed or padded for FFT convolution.\n"
                 f"  - Original shape : {data.mask.shape}\n"
@@ -345,10 +350,13 @@ def apply_mask(self, mask: Mask2D, disable_fft_pad: bool = False) -> "Imaging":
         mask
             The 2D mask that is applied to the image.
         """
-        if not self.data.mask.is_all_false:
+        invalid = np.logical_and(self.data.mask, np.logical_not(mask))
+
+        if np.any(invalid):
             raise exc.DatasetException(
-                "The mask has already been applied to the dataset, therefore a new mask cannot be applied. "
-                "If you wish to apply a new mask, please reload the dataset from .fits files."
+                "The new mask overlaps with pixels that are already unmasked in the dataset. "
+                "You cannot apply a new mask on top of an existing one. "
+                "If you wish to apply a different mask, please reload the dataset from .fits files."
             )
 
         data = Array2D(values=self.data.native, mask=mask)

test_autoarray/conftest.py

@@ -14,6 +14,9 @@ def pytest_configure():
 from autoconf import conf
 
 
+
+
+
 class PlotPatch:
     def __init__(self):
         self.paths = []