Rebase

Author: samaloney

.editorconfig

@@ -12,6 +12,6 @@ trim_trailing_whitespace=true
 indent_style=space
 indent_size=4
 
-[*.yml]
+[{*.yml,*.toml}]
 indent_style=space
 indent_size=2

.github/workflows/ci.yml

@@ -2,15 +2,15 @@ name: CI
 
 on:
   push:
-#    branches:
-#      - 'main'
-#      - '*.*'
-#      - '!*backport*'
-#    tags:
-#      - 'v*'
-#      - '!*dev*'
-#      - '!*pre*'
-#      - '!*post*'
+    branches:
+      - 'main'
+      - '*.*'
+      - '!*backport*'
+    tags:
+      - 'v*'
+      - '!*dev*'
+      - '!*pre*'
+      - '!*post*'
   pull_request:
   # Allow manual runs through the web UI
   workflow_dispatch:

changelog/83.feature.rst

@@ -0,0 +1 @@
+Add a basic visibility forward fitting method (`xrayvision.vis_forward_fit.forward_fit.vis_forward_fit`).

examples/rhessi.py

@@ -4,6 +4,7 @@
 ======================================
 
 Create images from RHESSI visibility data
+
 """
 
 import astropy.units as apu

pyproject.toml

@@ -21,7 +21,6 @@ dependencies = [
     "packaging>=23.0",
     "scipy>=1.13",
     "xarray>=2023.5.0",
-    "pymoo>=0.6.1.3"
 ]
 dynamic = ["version"]
 keywords = ["solar", "physics", "solar", "sun", "x-rays"]
@@ -43,7 +42,10 @@ classifiers = [
 map = [
     "sunpy[map]>=5.1.0"
 ]
-all = ["xrayvisim[map]"]
+pso = [
+        "pymoo>=0.6.1.3"
+]
+all = ["xrayvisim[map,pso]"]
 tests = [
     "matplotlib>=3.8.0",
     "pytest-astropy>=0.11.0",

ruff.toml

@@ -8,7 +8,7 @@ exclude = [
 ]
 
 [lint]
-select = ["E", "F", "W", "UP", "PT"]
+select = ["E", "F", "W", "UP", "PT", "C"]
 extend-ignore = [
   # pycodestyle (E, W)
   "E501", # LineTooLong                             # TODO! fix
@@ -27,7 +27,12 @@ extend-ignore = [
 "docs/conf.py" = ["E402"]
 "docs/*.py" = [
   "INP001",  # Implicit-namespace-package. The examples are not a package.
+  "D100"
 ]
+"examples/*.py" = [
+  "D"
+]
+
 "__init__.py" = ["E402", "F401", "F403"]
 "test_*.py" = ["B011", "D", "E402", "PGH001", "S101"]
 # Need to import clients to register them, but don't use them in file

xrayvision/clean.py

@@ -198,7 +198,6 @@ def vis_clean(
     map :
         Return a `sunpy.map.Map` by default or array only if `False`
     """
-
     dirty_map = vis_to_map(vis, shape=shape, pixel_size=pixel_size, **kwargs)
     dirty_beam_shape = [x.value * 3 + 1 if x.value * 3 % 2 == 0 else x.value * 3 for x in shape] * shape.unit
     dirty_beam = vis_psf_image(vis, shape=dirty_beam_shape, pixel_size=pixel_size, **kwargs)

xrayvision/coordinates/frames.py

@@ -71,7 +71,7 @@ def projective_wcs_to_frame(wcs):
     observer = None
     for frame, attr_names in required_attrs.items():
         attrs = [getattr(wcs.wcs.aux, attr_name) for attr_name in attr_names]
-        if all([attr is not None for attr in attrs]):
+        if all(attr is not None for attr in attrs):
             kwargs = {"obstime": dateavg}
             if rsun is not None:
                 kwargs["rsun"] = rsun

xrayvision/mem.py

@@ -133,7 +133,6 @@ def _estimate_flux(vis, shape, pixel, maxiter=1000, tol=1e-3):
     Estimated total flux
 
     """
-
     Hv, Lip, Visib = _prepare_for_optimise(pixel, shape, vis)
 
     # PROJECTED LANDWEBER
@@ -237,7 +236,6 @@ def _get_mean_visibilities(vis, shape, pixel):
     -------
     Mean Visibilities
     """
-
     if vis.amplitude_uncertainty is None:
         amplitude_uncertainty = np.ones_like(vis.visibilities)
     else:
@@ -374,7 +372,6 @@ def _proximal_operator(z, f, m, lamb, Lip, niter=250):
     -------
 
     """
-
     # INITIALIZATION OF THE DYKSTRA - LIKE SPLITTING
     x = z[:]
     p = np.zeros_like(x)
@@ -434,11 +431,11 @@ def _optimise_fb(Hv, Visib, Lip, flux, lambd, shape, pixel, maxiter, tol):
         Maximum number of iterations
     tol :
         Tolerance value used in the stopping rule ( || x - x_old || <= tol || x_old ||)
+
     Returns
     -------
     MEM Image
     """
-
     # 'f': value of the total flux of the image (taking into account the area of the pixel)
     f = flux / (pixel[0] * pixel[1])
     # 'm': total flux divided by the number of pixels of the image

xrayvision/tests/test_visibility.py

@@ -109,7 +109,7 @@ def test_vis_eq(visibilities):
 def test_meta_eq(vis_meta):
     meta = vis_meta
     assert meta == meta
-    meta = vm.VisMeta(dict())
+    meta = vm.VisMeta({})
     assert meta == meta