diff options
Diffstat (limited to 'stwcs/wcsutil')
| -rw-r--r-- | stwcs/wcsutil/getinput.py | 15 | ||||
| -rw-r--r-- | stwcs/wcsutil/hstwcs.py | 8 |
2 files changed, 13 insertions, 10 deletions
diff --git a/stwcs/wcsutil/getinput.py b/stwcs/wcsutil/getinput.py index da52970..c8b3b1b 100644 --- a/stwcs/wcsutil/getinput.py +++ b/stwcs/wcsutil/getinput.py @@ -1,13 +1,14 @@ from __future__ import absolute_import, division, print_function + from astropy.io import fits from stsci.tools import irafglob, fileutil, parseinput -from .hstwcs import HSTWCS +#from . import HSTWCS def parseSingleInput(f=None, ext=None): if isinstance(f, str): # create an HSTWCS object from a filename - if ext is None: + if ext is not None: filename = f if isinstance(ext, tuple): if ext[0] == '': @@ -57,9 +58,9 @@ def parseMultipleInput(input): filelist, output = parseinput.parseinput(input) except IOError: raise elif isinstance(input, list): - if isinstance(input[0], HSTWCS): - # a list of HSTWCS objects - return input - else: - filelist = input[:] + #if isinstance(input[0], HSTWCS): + ## a list of HSTWCS objects + #return input + #else: + filelist = input[:] return filelist diff --git a/stwcs/wcsutil/hstwcs.py b/stwcs/wcsutil/hstwcs.py index 81e1432..27f6467 100644 --- a/stwcs/wcsutil/hstwcs.py +++ b/stwcs/wcsutil/hstwcs.py @@ -3,15 +3,17 @@ from __future__ import absolute_import, division, print_function import os from astropy.wcs import WCS from astropy.io import fits -from stwcs.distortion import models, coeff_converter +from ..distortion import models, coeff_converter import numpy as np from stsci.tools import fileutil -from . import altwcs +from . import pc2cd from . import getinput from . import instruments from .mappings import inst_mappings, ins_spec_kw +__all__ = ['HSTWCS'] + def extract_rootname(kwvalue, suffix=""): """ Returns the rootname from a full reference filename @@ -384,7 +386,7 @@ class HSTWCS(WCS): if not wcskey: wcskey = self.wcs.alt if self.wcs.has_cd(): - h = altwcs.pc2cd(h, key=wcskey) + h = pc2cd(h, key=wcskey) if 'wcsname' not in h: if self.idctab is not None: |