minor updates mostly text

bugfix
spacetelescope · Oct 4, 2018 · 27a8851 · 27a8851
1 parent 3fccab4
commit 27a8851
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/imexam/imexamine.py b/imexam/imexamine.py
@@ -1010,6 +1010,8 @@ def radial_profile(self, x, y, data=None, form=None,
             centerx = x
         icenterx = int(centerx)
         icentery = int(centery)
+
+        # fractional center
         xfrac = centerx - icenterx
         yfrac = centery - icentery
 
@@ -1018,8 +1020,8 @@ def radial_profile(self, x, y, data=None, form=None,
                           icenterx - datasize:icenterx + datasize]
 
         y, x = np.indices(data_chunk.shape)  # index of all pixels
-        y = np.abs(y - datasize) + xfrac
-        x = np.abs(x - datasize) + yfrac 
+        y = np.abs(y - datasize) - 0.5 + np.abs(0.5 - yfrac)
+        x = np.abs(x - datasize) - 0.5 + np.abs(0.5 - xfrac)
         x[datasize, datasize] = 0
         y[datasize, datasize] = 0
 
@@ -1083,7 +1085,7 @@ def radial_profile(self, x, y, data=None, form=None,
                                                   sigma_factor=sig_factor,
                                                   center_at=0,
                                                   weighted=True)
-                self.log.info(fitted)
+
                 fwhmx, fwhmy = math_helper.gfwhm(fitted.stddev_0.value)
                 legend = ("Max. pix. flux = {0:9.3f}\n"
                           "amp = {1:9.3f}\n"

diff --git a/imexam/tests/test_imexamine.py b/imexam/tests/test_imexamine.py
@@ -130,7 +130,10 @@ def test_gauss_center():
 
 
 def test_radial_profile():
-    """Test the radial profile function without background subtraction"""
+    """Test the radial profile function
+    No background subtraction
+    Cummulive pixels used
+    """
     from astropy.convolution import Gaussian2DKernel
     data = Gaussian2DKernel(1.5, x_size=25, y_size=25)
     xx, yy = np.meshgrid(np.arange(25), np.arange(25))
@@ -146,6 +149,7 @@ def test_radial_profile():
 
     plots = Imexamine()
     plots.set_data(data.array)
+
     # check the binned results
     plots.radial_profile_pars['pixels'][0] = False
     plots.radial_profile_pars['background'][0] = False
@@ -163,7 +167,9 @@ def test_radial_profile():
 
 @pytest.mark.skipif('not HAS_PHOTUTILS')
 def test_radial_profile_background():
-    """Test the radial profile function with background subtraction"""
+    """Test the radial profile function
+    With background subtraction
+    Cummulative pixels """
     from astropy.convolution import Gaussian2DKernel
     data = Gaussian2DKernel(1.5, x_size=25, y_size=25)
     xx, yy = np.meshgrid(np.arange(25), np.arange(25))
@@ -195,7 +201,10 @@ def test_radial_profile_background():
 
 
 def test_radial_profile_pixels():
-    """Test the radial profile function without background subtraction"""
+    """Test the radial profile function
+    without background subtraction
+    with each pixel unsummed
+    """
     from astropy.convolution import Gaussian2DKernel
     data = Gaussian2DKernel(1.5, x_size=25, y_size=25)
     xx, yy = np.meshgrid(np.arange(25), np.arange(25))

diff --git a/imexam/tests/test_util.py b/imexam/tests/test_util.py
@@ -4,7 +4,7 @@
 """
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
-import pytest
+
 import numpy as np
 from numpy.testing import assert_equal
 from astropy.io import fits
@@ -15,7 +15,7 @@
 
 
 def test_invalid_simple_fits():
-    """Test for an invalid FITS hdu with no data in
+    """Test for an invalid simple FITS hdu with no data in
     the primary HDU."""
 
     simple_fits_hdu = fits.PrimaryHDU()
@@ -59,7 +59,7 @@ def test_image_and_table_extensions():
     mef_fits_hdu = fits.HDUList()
     mef_fits_hdu.append(fits.PrimaryHDU())
     extension = fits.PrimaryHDU()
-    
+
     mef_fits_hdu.append(tbhdu)
     mef_fits_hdu.append(fits.ImageHDU(test_data_zeros,
                                       header=extension.header,