summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/__init__.py6
-rw-r--r--lib/mappings.py38
-rw-r--r--lib/utils.py2
3 files changed, 5 insertions, 41 deletions
diff --git a/lib/__init__.py b/lib/__init__.py
index c9dca75..4f383fe 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -1,8 +1,10 @@
#import all needed modules here to avoid relative imports
-import mappings
+#import mappings
import utils
import distortion
import pywcs
+from pytools import fileutil
+DEGTORAD = fileutil.DEGTORAD
+RADTODEG = fileutil.RADTODEG
- \ No newline at end of file
diff --git a/lib/mappings.py b/lib/mappings.py
deleted file mode 100644
index 4cc4327..0000000
--- a/lib/mappings.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from pytools import fileutil
-
-# This dictionary maps an instrument into an instrument class
-# The instrument class handles instrument specific keywords
-
-inst_mappings={'WFPC2': 'WFPC2WCS',
- 'ACS': 'ACSWCS'
- }
-
-DEGTORAD = fileutil.DEGTORAD
-RADTODEG = fileutil.RADTODEG
-
-# A dictionary which lists the allowed corrections for each instrument.
-# These are the default corrections applied also in the pipeline.
-#Dgeo correction is applied separately.
-allowed_corrections={'WFPC2': ['MakeWCS','CompSIP', 'VACorr', 'DGEOCorr'],
- 'ACS': ['TDDCorr', 'MakeWCS','CompSIP', 'VACorr', 'DGEOCorr']
- }
-
-# A list of instrument specific keywords
-# Every instrument class must have methods which define each of these
-# as class attributes.
-ins_spec_kw = ['ltv1', 'ltv2', 'parity', 'binned','vafactor', 'chip',
- 'naxis1', 'naxis2', 'filter1', 'filter2']
-
-# A list of keywords defined in the primary header.
-# The HSTWCS class sets this as attributes
-prim_hdr_kw = ['detector', 'offtab', 'idctab', 'date-obs',
- 'pa_v3', 'ra_targ', 'dec_targ']
-
-# These are the keywords which are archived before MakeWCS is run
-basic_wcs = ['CD1_1', 'CD1_2', 'CD2_1', 'CD2_2', 'CRVAL1','CRVAL2','CTYPE1', 'CTYPE2',
- 'CRPIX1', 'CRPIX2', 'CTYPE1', 'CTYPE2', 'ORIENTAT', 'NAXIS1', 'NAXIS2']
-
-dgeo_vals = {'ACS':
- {'naxis1':65, 'naxis2':33, 'extver':1, 'crpix1':33.5, 'crpix2':16.5,
- 'cdelt1':1., 'cdelt2':1., 'crval1':2048., 'crval2':1024.}
- } \ No newline at end of file
diff --git a/lib/utils.py b/lib/utils.py
index b29c67c..efe8594 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -1,6 +1,6 @@
from pytools import parseinput, fileutil
import pyfits
-from mappings import basic_wcs
+from wcsutil.mappings import basic_wcs
def restoreWCS(fnames):
"""