diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 9c6e7190..92d0d10e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -175,4 +175,4 @@ Phase unwrapping integration - François Orieux - Image deconvolution + Image deconvolution http://research.orieux.fr diff --git a/skimage/restoration/deconvolution.py b/skimage/restoration/deconvolution.py index c684dcf3..2110dda7 100644 --- a/skimage/restoration/deconvolution.py +++ b/skimage/restoration/deconvolution.py @@ -35,12 +35,10 @@ from . import uft __copyright__ = "Copyright scikit-image team" __credits__ = ["François Orieux"] __license__ = "mit" -__version__ = "0.1.0" +__version__ = "1.0.0" __maintainer__ = "François Orieux" -__email__ = "orieux@iap.fr" __status__ = "stable" -__url__ = "http://research.orieux.fr" -__keywords__ = "restoration, image" +__keywords__ = "restoration, image, deconvolution" def wiener(data, psf, reg_val, reg=None, real=True): diff --git a/skimage/restoration/uft.py b/skimage/restoration/uft.py index a4117d15..438ba30a 100644 --- a/skimage/restoration/uft.py +++ b/skimage/restoration/uft.py @@ -34,10 +34,9 @@ equal to .. math:: \frac{1}{\sqrt{n}} \sum_i x_i. -You must keep in mind that the transform are applied from the last -axes. this is a fftw convention for performance reason (c order -array). If you want more sofisticated use, you must use directly the -numpy.fft module. +The transform is applied from the last axes for performance reason (c +order array). You may use directly the numpy.fft module for more +sophisticated purpose. References ---------- @@ -52,11 +51,10 @@ References import numpy as np __copyright__ = "Copyright scikit-image team" +__credits__ = ["François Orieux"] __license__ = "mit" -__version__ = "0.1.0" +__version__ = "1.0.0" __maintainer__ = "Francois Orieux" -__email__ = "orieux@iap.fr" -__url__ = "" __keywords__ = "fft" @@ -427,8 +425,3 @@ def laplacian(ndim, shape): impr[([slice(1, 2)] * ndim)] = 2.0 * ndim return ir2tf(impr, shape), impr - - -if __name__ == "__main__": - import doctest - doctest.testmod(optionflags=doctest.ELLIPSIS)