Skip to content

Commit

Permalink
Merge pull request #76 from pllim/rm-testers
Browse files Browse the repository at this point in the history
Remove defunct modules
  • Loading branch information
pllim committed Aug 7, 2018
2 parents ec33725 + 731a4af commit 5f25467
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 497 deletions.
29 changes: 29 additions & 0 deletions LICENSE.md
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2018, Space Telescope Science Institute, AURA
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 changes: 0 additions & 29 deletions LICENSE.txt

This file was deleted.

2 changes: 1 addition & 1 deletion doc/source/bitmask.rst
Expand Up @@ -2,7 +2,7 @@
Utility functions for handling bit masks and mask arrays.
*********************************************************

.. moduleauthor:: Mihai Cara <help@stsci.edu>
.. moduleauthor:: Mihai Cara

.. currentmodule:: stsci.tools.bitmask

Expand Down
4 changes: 2 additions & 2 deletions lib/stsci/tools/bitmask.py
Expand Up @@ -2,9 +2,9 @@
A module that provides functions for manipulating bitmasks and data quality
(DQ) arrays.
:Authors: Mihai Cara (contact: help@stsci.edu)
:Authors: Mihai Cara
:License: `<http://www.stsci.edu/resources/software_hardware/pyraf/LICENSE>`_
:License: See LICENSE.md
"""

Expand Down
5 changes: 1 addition & 4 deletions lib/stsci/tools/fileutil.py
Expand Up @@ -72,10 +72,7 @@
Returns true if file exists, where filename can include IRAF variables
"""

from __future__ import division, print_function # confidence high

from . import numerixenv
numerixenv.check()
from __future__ import absolute_import, division, print_function # confidence high

import astropy
from . import stpyfits as fits
Expand Down
14 changes: 6 additions & 8 deletions lib/stsci/tools/gfit.py
Expand Up @@ -4,7 +4,6 @@
Uses mpfit.py - a python implementation of the Levenberg-Marquardt
least-squares minimization, based on MINPACK-1. See nmpfit.py for
the history of this module (fortran -> idl -> python).
nmpfit.py is a version of mpfit.py which uses numarray.
@author: Nadia Dencheva
@version: '1.0 (2007-02-20)'
Expand All @@ -25,8 +24,7 @@
__vdate__ = '2018-04-20' # Date of this version



def _gauss_funct(p, fjac = None, x = None, y=None, err=None,
def _gauss_funct(p, fjac=None, x=None, y=None, err=None,
weights=None):

"""
Expand All @@ -53,22 +51,22 @@ def _gauss_funct(p, fjac = None, x = None, y=None, err=None,
return [status, y - model]


def gfit1d(y, x=None, err = None, weights=None, par=None, parinfo=None,
def gfit1d(y, x=None, err=None, weights=None, par=None, parinfo=None,
maxiter=200, quiet=0):
"""
Return the gaussian fit as an object.
Parameters
----------
y: 1D Numarray array
y: 1D Numpy array
The data to be fitted
x: 1D Numarray array
x: 1D Numpy array
(optional) The x values of the y array. x and y must
have the same shape.
err: 1D Numarray array
err: 1D Numpy array
(optional) 1D array with measurement errors, must be
the same shape as y
weights: 1D Numarray array
weights: 1D Numpy array
(optiional) 1D array with weights, must be the same
shape as y
par: List
Expand Down
1 change: 0 additions & 1 deletion lib/stsci/tools/linefit.py
Expand Up @@ -42,7 +42,6 @@ def linefit(x, y, weights=None):
>>> around(linefit(x,y), decimals=5)
array([1.42564, 0.31579])
"""

if len(x) != len(y):
print("Error: X and Y must have equal size\n")
return
Expand Down
3 changes: 0 additions & 3 deletions lib/stsci/tools/nmpfit.py
Expand Up @@ -412,9 +412,6 @@ def myfunct(p, fjac=None, x=None, y=None, err=None)
Translated from MPFIT (Craig Markwardt's IDL package) to Python,
August, 2002. Mark Rivers
"""
from . import numerixenv
numerixenv.check()

import numpy
import types

Expand Down
17 changes: 0 additions & 17 deletions lib/stsci/tools/numerixenv.py

This file was deleted.

30 changes: 0 additions & 30 deletions lib/stsci/tools/stash.py

This file was deleted.

136 changes: 0 additions & 136 deletions lib/stsci/tools/tester.py

This file was deleted.

2 changes: 1 addition & 1 deletion lib/stsci/tools/tests/test_bitmask.py
@@ -1,7 +1,7 @@
"""
A module containing unit tests for the `bitmask` modue.
:Authors: Mihai Cara (contact: help@stsci.edu)
:Authors: Mihai Cara
"""
from __future__ import (absolute_import, division, unicode_literals,
Expand Down

0 comments on commit 5f25467

Please sign in to comment.