diff options
Diffstat (limited to 'updatewcs')
-rw-r--r-- | updatewcs/corrections.py | 2 | ||||
-rw-r--r-- | updatewcs/det2im.py | 2 | ||||
-rw-r--r-- | updatewcs/dgeo.py | 2 | ||||
-rw-r--r-- | updatewcs/makewcs.py | 2 | ||||
-rw-r--r-- | updatewcs/utils.py | 28 |
5 files changed, 32 insertions, 4 deletions
diff --git a/updatewcs/corrections.py b/updatewcs/corrections.py index fea44c1..686277c 100644 --- a/updatewcs/corrections.py +++ b/updatewcs/corrections.py @@ -4,7 +4,7 @@ import datetime import numpy as np from numpy import linalg from pytools import fileutil -from stwcs.utils import diff_angles +from utils import diff_angles import makewcs, dgeo MakeWCS = makewcs.MakeWCS diff --git a/updatewcs/det2im.py b/updatewcs/det2im.py index 0d87134..c9837c9 100644 --- a/updatewcs/det2im.py +++ b/updatewcs/det2im.py @@ -2,7 +2,7 @@ from __future__ import division # confidence high import pyfits from pytools import fileutil -from stwcs import utils +import utils class DET2IMCorr(object): def updateWCS(cls, fobj): diff --git a/updatewcs/dgeo.py b/updatewcs/dgeo.py index 3d49a8b..fd1c214 100644 --- a/updatewcs/dgeo.py +++ b/updatewcs/dgeo.py @@ -2,7 +2,7 @@ from __future__ import division # confidence high import pyfits from pytools import fileutil -from stwcs import utils +import utils import numpy as np class DGEOCorr(object): diff --git a/updatewcs/makewcs.py b/updatewcs/makewcs.py index 77c8aa9..49bca0b 100644 --- a/updatewcs/makewcs.py +++ b/updatewcs/makewcs.py @@ -3,7 +3,7 @@ from __future__ import division # confidence high from stwcs import DEGTORAD, RADTODEG import numpy as np from math import sin, sqrt, pow, cos, asin, atan2,pi -from stwcs import utils +import utils from pytools import fileutil class MakeWCS(object): diff --git a/updatewcs/utils.py b/updatewcs/utils.py new file mode 100644 index 0000000..29ba5f3 --- /dev/null +++ b/updatewcs/utils.py @@ -0,0 +1,28 @@ +from __future__ import division # confidence high + +def diff_angles(a,b): + """ + Perform angle subtraction a-b taking into account + small-angle differences across 360degree line. + """ + + diff = a - b + + if diff > 180.0: + diff -= 360.0 + + if diff < -180.0: + diff += 360.0 + + return diff + +def getBinning(fobj, extver=1): + # Return the binning factor + binned = 1 + if fobj[0].header['INSTRUME'] == 'WFPC2': + mode = fobj[0].header.get('MODE', "") + if mode == 'AREA': binned = 2 + else: + binned = fobj['SCI', extver].header.get('BINAXIS',1) + return binned + |