summaryrefslogtreecommitdiff
path: root/lib/stwcs/updatewcs
diff options
context:
space:
mode:
Diffstat (limited to 'lib/stwcs/updatewcs')
-rw-r--r--lib/stwcs/updatewcs/__init__.py25
-rw-r--r--lib/stwcs/updatewcs/apply_corrections.py6
-rw-r--r--lib/stwcs/updatewcs/corrections.py12
-rw-r--r--lib/stwcs/updatewcs/det2im.py13
-rw-r--r--lib/stwcs/updatewcs/makewcs.py7
-rw-r--r--lib/stwcs/updatewcs/npol.py16
6 files changed, 42 insertions, 37 deletions
diff --git a/lib/stwcs/updatewcs/__init__.py b/lib/stwcs/updatewcs/__init__.py
index aca33f7..a7f9a3e 100644
--- a/lib/stwcs/updatewcs/__init__.py
+++ b/lib/stwcs/updatewcs/__init__.py
@@ -1,11 +1,10 @@
-from __future__ import division # confidence high
+from __future__ import division, print_function # confidence high
-import os
from astropy.io import fits
-import numpy as np
from stwcs import wcsutil
from stwcs.wcsutil import HSTWCS
import stwcs
+
from astropy import wcs as pywcs
import astropy
@@ -84,7 +83,7 @@ def updatewcs(input, vacorr=True, tddcorr=True, npolcorr=True, d2imcorr=True,
if checkfiles:
files = checkFiles(files)
if not files:
- print 'No valid input, quitting ...\n'
+ print('No valid input, quitting ...\n')
return
for f in files:
@@ -242,9 +241,9 @@ def getNrefchip(fobj):
img.header['EXTNAME'].lower()=='sci']
fitsext = [i for i in range(len(fobj))[1:] if
fobj[i].header['EXTNAME'].lower()=='sci']
- det2ext=dict(map(None, detectors,extvers))
- ext2det=dict(map(None, extvers, detectors))
- ext2fitsext=dict(map(None, extvers, fitsext))
+ det2ext=dict(list(zip(detectors, extvers)))
+ ext2det=dict(list(zip(extvers, detectors)))
+ ext2fitsext=dict(list(zip(extvers, fitsext)))
if 3 not in detectors:
nrefchip = ext2det.pop(extvers[0])
@@ -263,9 +262,9 @@ def getNrefchip(fobj):
img.header['EXTNAME'].lower()=='sci']
fitsext = [i for i in range(len(fobj))[1:] if
fobj[i].header['EXTNAME'].lower()=='sci']
- det2ext=dict(map(None, detectors,extvers))
- ext2det=dict(map(None, extvers, detectors))
- ext2fitsext=dict(map(None, extvers, fitsext))
+ det2ext=dict(list(zip(detectors, extvers)))
+ ext2det=dict(list(zip(extvers, detectors)))
+ ext2fitsext=dict(list(zip(extvers, fitsext)))
if 2 not in detectors:
nrefchip = ext2det.pop(extvers[0])
@@ -356,7 +355,7 @@ def cleanWCS(fname):
keys.remove(' ')
except ValueError:
pass
- fext = range(len(f))
+ fext = list(range(len(f)))
for key in keys:
wcsutil.deleteWCS(fname, ext=fext, wcskey=key)
@@ -369,5 +368,5 @@ def getCorrections(instrument):
"""
acorr = apply_corrections.allowed_corrections[instrument]
- print "The following corrections will be performed for instrument %s\n" % instrument
- for c in acorr: print c,': ' , apply_corrections.cnames[c]
+ print("The following corrections will be performed for instrument %s\n" % instrument)
+ for c in acorr: print(c,': ' , apply_corrections.cnames[c])
diff --git a/lib/stwcs/updatewcs/apply_corrections.py b/lib/stwcs/updatewcs/apply_corrections.py
index b7e41b2..2871a46 100644
--- a/lib/stwcs/updatewcs/apply_corrections.py
+++ b/lib/stwcs/updatewcs/apply_corrections.py
@@ -1,4 +1,4 @@
-from __future__ import division # confidence high
+from __future__ import division, print_function # confidence high
import os
from astropy.io import fits
@@ -198,7 +198,7 @@ def applyD2ImCorr(fname, d2imcorr):
msg = """\n\tKw D2IMFILE exists in primary header but file %s not found\n
Detector to image correction will not be applied\n""" % fd2im0
logger.critical(msg)
- print msg
+ print(msg)
applyD2IMCorr = False
return applyD2IMCorr
try:
@@ -220,6 +220,6 @@ def applyD2ImCorr(fname, d2imcorr):
# in first extension header
applyD2IMCorr = True
except KeyError:
- print 'D2IMFILE keyword not found in primary header'
+ print('D2IMFILE keyword not found in primary header')
applyD2IMCorr = False
return applyD2IMCorr
diff --git a/lib/stwcs/updatewcs/corrections.py b/lib/stwcs/updatewcs/corrections.py
index f44b73b..e36dcd6 100644
--- a/lib/stwcs/updatewcs/corrections.py
+++ b/lib/stwcs/updatewcs/corrections.py
@@ -1,14 +1,16 @@
-from __future__ import division # confidence high
+from __future__ import division, print_function # confidence high
import copy
import datetime
+import logging, time
import numpy as np
from numpy import linalg
from stsci.tools import fileutil
-from utils import diff_angles
-import makewcs, npol
-import logging, time
+from . import npol
+from . import makewcs
+from .utils import diff_angles
+
logger=logging.getLogger('stwcs.updatewcs.corrections')
MakeWCS = makewcs.MakeWCS
@@ -221,7 +223,7 @@ class TDDCorr(object):
err_str += " The pre-SM4 time-dependent skew solution will be used by default.\n"
err_str += " Please update IDCTAB with new reference file from HST archive. \n"
err_str += "------------------------------------------------------------------------ \n"
- print err_str
+ print(err_str)
# Using default pre-SM4 coefficients
skew_coeffs = {'TDD_A':[0.095,0.090/2.5],
'TDD_B':[-0.029,-0.030/2.5],
diff --git a/lib/stwcs/updatewcs/det2im.py b/lib/stwcs/updatewcs/det2im.py
index 902deaa..dfda9d1 100644
--- a/lib/stwcs/updatewcs/det2im.py
+++ b/lib/stwcs/updatewcs/det2im.py
@@ -1,9 +1,10 @@
-from __future__ import division # confidence high
+from __future__ import absolute_import, division # confidence high
+import numpy as np
from astropy.io import fits
from stsci.tools import fileutil
-import utils
-import numpy as np
+
+from . import utils
import logging, time
logger = logging.getLogger('stwcs.updatewcs.d2im')
@@ -223,7 +224,7 @@ class DET2IMCorr(object):
kw_comm1 = {}
kw_val1 = {}
- for key in kw.keys():
+ for key in kw:
for i in range(1, naxis+1):
si = str(i)
kw_comm1[key+si] = kw[key]
@@ -254,9 +255,9 @@ class DET2IMCorr(object):
'CCDCHIP': ccdchip,
}
cdl = []
- for key in kw_comm0.keys():
+ for key in kw_comm0:
cdl.append((key, kw_val0[key], kw_comm0[key]))
- for key in kw_comm1.keys():
+ for key in kw_comm1:
cdl.append((key, kw_val1[key], kw_comm1[key]))
# Now add keywords from NPOLFILE header to document source of calibration
# include all keywords after and including 'FILENAME' from header
diff --git a/lib/stwcs/updatewcs/makewcs.py b/lib/stwcs/updatewcs/makewcs.py
index 68ceded..06c6f9c 100644
--- a/lib/stwcs/updatewcs/makewcs.py
+++ b/lib/stwcs/updatewcs/makewcs.py
@@ -1,13 +1,14 @@
-from __future__ import division # confidence high
+from __future__ import absolute_import, division # confidence high
import datetime
import numpy as np
+import logging, time
from math import sin, sqrt, pow, cos, asin, atan2,pi
-import utils
+
from stsci.tools import fileutil
+from . import utils
-import logging, time
logger = logging.getLogger(__name__)
class MakeWCS(object):
diff --git a/lib/stwcs/updatewcs/npol.py b/lib/stwcs/updatewcs/npol.py
index cee7b9b..4e109ae 100644
--- a/lib/stwcs/updatewcs/npol.py
+++ b/lib/stwcs/updatewcs/npol.py
@@ -1,11 +1,13 @@
-from __future__ import division # confidence high
+from __future__ import absolute_import, division # confidence high
+import logging, time
+
+import numpy as np
from astropy.io import fits
+
from stsci.tools import fileutil
-import utils
-import numpy as np
+from . import utils
-import logging, time
logger = logging.getLogger('stwcs.updatewcs.npol')
class NPOLCorr(object):
@@ -264,7 +266,7 @@ class NPOLCorr(object):
kw_comm1 = {}
kw_val1 = {}
- for key in kw.keys():
+ for key in kw:
for i in range(1, naxis+1):
si = str(i)
kw_comm1[key+si] = kw[key]
@@ -297,9 +299,9 @@ class NPOLCorr(object):
'CCDCHIP': ccdchip,
}
cdl = []
- for key in kw_comm0.keys():
+ for key in kw_comm0:
cdl.append((key, kw_val0[key], kw_comm0[key]))
- for key in kw_comm1.keys():
+ for key in kw_comm1:
cdl.append((key, kw_val1[key], kw_comm1[key]))
# Now add keywords from NPOLFILE header to document source of calibration
# include all keywords after and including 'FILENAME' from header
generated by cgit (git 2.34.1) at 2025-04-29 09:20:43 -0400