summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordencheva <dencheva@stsci.edu>2009-12-23 09:50:14 -0500
committerdencheva <dencheva@stsci.edu>2009-12-23 09:50:14 -0500
commit2f294bfefb6316ee52c5621353e5a654504df698 (patch)
tree156c74f6e9c4c726b3e62974f9e96f0bd2933fc9
parentc5cafea89ac4ff504ac85b72200e56b027a23e09 (diff)
downloadstwcs_hcf-2f294bfefb6316ee52c5621353e5a654504df698.tar.gz
'from __future__ import division' changes
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stsci_python/trunk/stwcs@8517 fe389314-cf27-0410-b35b-8c050e845b92
-rw-r--r--distortion/coeff_converter.py2
-rw-r--r--distortion/models.py3
-rw-r--r--distortion/mutil.py2
-rw-r--r--distortion/utils.py2
-rw-r--r--lib/__init__.py2
-rw-r--r--lib/utils.py6
-rw-r--r--updatewcs/__init__.py2
-rw-r--r--updatewcs/apply_corrections.py2
-rw-r--r--updatewcs/corrections.py2
-rw-r--r--updatewcs/det2im.py2
-rw-r--r--updatewcs/dgeo.py4
-rw-r--r--updatewcs/makewcs.py2
-rw-r--r--wcsutil/__init__.py2
-rw-r--r--wcsutil/instruments.py2
-rw-r--r--wcsutil/mappings.py2
15 files changed, 32 insertions, 5 deletions
diff --git a/distortion/coeff_converter.py b/distortion/coeff_converter.py
index e31854d..807bc3f 100644
--- a/distortion/coeff_converter.py
+++ b/distortion/coeff_converter.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import numpy as np
import pyfits
import pywcs
diff --git a/distortion/models.py b/distortion/models.py
index cff9a46..d4651fa 100644
--- a/distortion/models.py
+++ b/distortion/models.py
@@ -1,5 +1,6 @@
-import types
+from __future__ import division # confidence high
+import types
# Import PyDrizzle utility modules
import mutil
import numpy as N
diff --git a/distortion/mutil.py b/distortion/mutil.py
index c3f83f2..5f17be9 100644
--- a/distortion/mutil.py
+++ b/distortion/mutil.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
from pytools import fileutil
import numpy as N
import string
diff --git a/distortion/utils.py b/distortion/utils.py
index 1ab8a81..a6b4fa5 100644
--- a/distortion/utils.py
+++ b/distortion/utils.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import numpy as np
import pywcs
import pyfits
diff --git a/lib/__init__.py b/lib/__init__.py
index 4c58e9b..c8d174d 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
#import all needed modules here to avoid relative imports
#import mappings
import utils
diff --git a/lib/utils.py b/lib/utils.py
index 504d609..e57cc43 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
from pytools import parseinput, fileutil
import pyfits
from wcsutil.mappings import basic_wcs
@@ -84,10 +86,10 @@ def diff_angles(a,b):
diff = a - b
if diff > 180.0:
- diff -= 360.0
+ diff -= 360.0
if diff < -180.0:
- diff += 360.0
+ diff += 360.0
return diff
diff --git a/updatewcs/__init__.py b/updatewcs/__init__.py
index 71987e7..26834db 100644
--- a/updatewcs/__init__.py
+++ b/updatewcs/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import os
import pyfits
from stwcs.wcsutil import HSTWCS
diff --git a/updatewcs/apply_corrections.py b/updatewcs/apply_corrections.py
index ef07c68..8e9cef7 100644
--- a/updatewcs/apply_corrections.py
+++ b/updatewcs/apply_corrections.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import os
import pyfits
import time
diff --git a/updatewcs/corrections.py b/updatewcs/corrections.py
index c5be8c3..6709664 100644
--- a/updatewcs/corrections.py
+++ b/updatewcs/corrections.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import datetime
import numpy
from numpy import linalg
diff --git a/updatewcs/det2im.py b/updatewcs/det2im.py
index da898d2..9009317 100644
--- a/updatewcs/det2im.py
+++ b/updatewcs/det2im.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import pyfits
from pytools import fileutil
from stwcs import utils
diff --git a/updatewcs/dgeo.py b/updatewcs/dgeo.py
index 9242a11..bed3191 100644
--- a/updatewcs/dgeo.py
+++ b/updatewcs/dgeo.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import pyfits
from pytools import fileutil
from stwcs import utils
@@ -128,7 +130,7 @@ class DGEOCorr(object):
values = {cperror: 0.0, cpdis: 'Lookup', dpext: wdvarr_ver, dpnaxes: 2,
dpaxis1: 1, dpaxis2: 2}
- comments = {cperror: 'Maximum error of dgeo correction for axis %s' % (wdvarr_ver/2),
+ comments = {cperror: 'Maximum error of dgeo correction for axis %s' % (wdvarr_ver//2 + 1),
cpdis: 'Prior distortion funcion type',
dpext: 'Version number of WCSDVARR extension containing lookup distortion table',
dpnaxes: 'Number of independent variables in distortion function',
diff --git a/updatewcs/makewcs.py b/updatewcs/makewcs.py
index 2e82bac..b455640 100644
--- a/updatewcs/makewcs.py
+++ b/updatewcs/makewcs.py
@@ -1,3 +1,5 @@
+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
diff --git a/wcsutil/__init__.py b/wcsutil/__init__.py
index 3afb218..dcce32f 100644
--- a/wcsutil/__init__.py
+++ b/wcsutil/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import os.path
from pywcs import WCS
import pyfits
diff --git a/wcsutil/instruments.py b/wcsutil/instruments.py
index df92d54..0787977 100644
--- a/wcsutil/instruments.py
+++ b/wcsutil/instruments.py
@@ -1,3 +1,5 @@
+from __future__ import division # confidence high
+
import pyfits
from mappings import ins_spec_kw
diff --git a/wcsutil/mappings.py b/wcsutil/mappings.py
index 32d6391..9ab1c6b 100644
--- a/wcsutil/mappings.py
+++ b/wcsutil/mappings.py
@@ -1,4 +1,4 @@
-
+from __future__ import division # confidence high
# This dictionary maps an instrument into an instrument class
# The instrument class handles instrument specific keywords