diff options
| -rw-r--r-- | defsetup.py | 6 | ||||
| -rw-r--r-- | distortion/utils.py | 2 | ||||
| -rw-r--r-- | hstwcs/__init__.py | 4 | ||||
| -rw-r--r-- | hstwcs/corrections.py | 2 | ||||
| -rw-r--r-- | hstwcs/makewcs.py | 4 | ||||
| -rw-r--r-- | wcsutil/__init__.py | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/defsetup.py b/defsetup.py index 0c4de95..5d04f2a 100644 --- a/defsetup.py +++ b/defsetup.py @@ -1,12 +1,12 @@ import sys -pkg = ["hstwcs", 'hstwcs.updatewcs', 'hstwcs.wcsutil', 'hstwcs.distortion'] +pkg = ["updatewcs", 'updatewcs.hstwcs', 'updatewcs.wcsutil', 'updatewcs.distortion'] setupargs = { 'version' : "0.1", 'description' : "Recomputes the WCS of an HST observation and puts all istortion corrections in the headers.", - 'package_dir': {'hstwcs':'lib', 'hstwcs.updatewcs': 'updatewcs', - 'hstwcs.wcsutil': 'wcsutil', 'hstwcs.distortion': 'distortion'}, + 'package_dir': {'updatewcs':'lib', 'updatewcs.hstwcs': 'hstwcs', + 'updatewcs.wcsutil': 'wcsutil', 'updatewcs.distortion': 'distortion'}, 'author' : "Nadia Dencheva, Warren Hack", 'author_email' : "help@stsci.edu", diff --git a/distortion/utils.py b/distortion/utils.py index 218c6bf..26f8f6e 100644 --- a/distortion/utils.py +++ b/distortion/utils.py @@ -1,7 +1,7 @@ import numpy as np import pywcs import pyfits -from hstwcs import wcsutil +from updatewcs import wcsutil from numpy import sqrt, arctan2 def output_wcs(list_of_wcsobj, ref_wcs=None, outwcs=None): diff --git a/hstwcs/__init__.py b/hstwcs/__init__.py index efa9287..2d280c4 100644 --- a/hstwcs/__init__.py +++ b/hstwcs/__init__.py @@ -1,10 +1,10 @@ import os import pyfits #from .. wcsutil import HSTWCS -from hstwcs.wcsutil import HSTWCS +from updatewcs.wcsutil import HSTWCS #from .. mappings import allowed_corrections -from hstwcs import utils +from updatewcs import utils import corrections, makewcs import dgeo import time diff --git a/hstwcs/corrections.py b/hstwcs/corrections.py index 645e98d..e76a260 100644 --- a/hstwcs/corrections.py +++ b/hstwcs/corrections.py @@ -2,7 +2,7 @@ import datetime import numpy from numpy import linalg from pytools import fileutil -from hstwcs.utils import diff_angles +from updatewcs.utils import diff_angles import makewcs, dgeo MakeWCS = makewcs.MakeWCS diff --git a/hstwcs/makewcs.py b/hstwcs/makewcs.py index 40be750..d016583 100644 --- a/hstwcs/makewcs.py +++ b/hstwcs/makewcs.py @@ -1,8 +1,8 @@ #from .. mappings import DEGTORAD, RADTODEG -from hstwcs import DEGTORAD, RADTODEG +from updatewcs import DEGTORAD, RADTODEG import numpy from math import sin, sqrt, pow, cos, asin, atan2,pi -from hstwcs import utils +from updatewcs import utils from pytools import fileutil class MakeWCS(object): diff --git a/wcsutil/__init__.py b/wcsutil/__init__.py index e406a9a..0f2e83d 100644 --- a/wcsutil/__init__.py +++ b/wcsutil/__init__.py @@ -3,7 +3,7 @@ from pywcs import WCS import pyfits import instruments #from .. distortion import models -from hstwcs.distortion import models +from updatewcs.distortion import models import numpy as N from pytools import fileutil from pytools.fileutil import DEGTORAD, RADTODEG |