Change source object to handle per source bounds etc

Author: samaloney

docs/reference/forward_fit.rst

@@ -1,8 +1,14 @@
-.. _forward_fit:
+.. vis_forward_fit:
 
-Forward Fit ('xrayvision.forward_fit')
-**********************
+Vis Forward Fit ('xrayvision.vis_forward_fit')
+**********************************************
 
-The ``forward_fit`` submodule contains the Maximum Entropy methods.
+The ``vis_forward_fit`` submodule contains the visibility forward fitting methods
 
-.. automodapi:: xrayvision.forward_fit
+.. automodapi:: xrayvision.vis_forward_fit
+
+.. automodapi:: xrayvision.vis_forward_fit.forward_fit
+   :include-all-objects:
+
+.. automodapi:: xrayvision.vis_forward_fit.sources
+   :include-all-objects:

examples/stix.py

@@ -14,9 +14,10 @@
 import numpy as np
 
 from xrayvision.clean import vis_clean
-from xrayvision.forward_fit import vis_forward_fit
 from xrayvision.imaging import vis_psf_map, vis_to_map
 from xrayvision.mem import mem, resistant_mean
+from xrayvision.vis_forward_fit.forward_fit import vis_forward_fit
+from xrayvision.vis_forward_fit.sources import Source, SourceList
 
 ###############################################################################
 # Create images from STIX visibility data.
@@ -69,10 +70,12 @@
 ###############################################################################
 # VIS_FWD_FIT
 
-vis_fwd_map = vis_forward_fit(stix_vis, shape=[129, 129] * apu.pixel, pixel_size=[1, 1] * apu.arcsec / apu.pix)
+sources = SourceList([Source("circular", 15, 1, 2, 5)])
+
+vis_fwd_map = vis_forward_fit(stix_vis, sources, shape=[129, 129] * apu.pixel, pixel_size=[1, 1] * apu.arcsec / apu.pix)
 
 vis_fwd_pso_map = vis_forward_fit(
-    stix_vis, method="PSO", shape=[129, 129] * apu.pixel, pixel_size=[1, 1] * apu.arcsec / apu.pix
+    stix_vis, sources, method="PSO", shape=[129, 129] * apu.pixel, pixel_size=[1, 1] * apu.arcsec / apu.pix
 )
 
 ###############################################################################