From f0d0edf3c0778abbd1f56ab172ca3eb7daa5c11a Mon Sep 17 00:00:00 2001
From: dencheva <dencheva@stsci.edu>
Date: Wed, 22 Oct 2008 15:09:18 +0000
Subject: Many changes to match the changes in pywcs.

git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/development/trunk/hstwcs@7189 fe389314-cf27-0410-b35b-8c050e845b92
---
 wcsutil/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'wcsutil/__init__.py')

diff --git a/wcsutil/__init__.py b/wcsutil/__init__.py
index 9482a48..f9e9c18 100644
--- a/wcsutil/__init__.py
+++ b/wcsutil/__init__.py
@@ -1,5 +1,5 @@
 #from .. pywcs.sip import SIP
-from pywcs.sip import SIP
+from pywcs import WCS
 import pyfits
 import instruments
 #from .. distortion import models
@@ -12,7 +12,7 @@ from hstwcs.mappings import basic_wcs, prim_hdr_kw
 
 __docformat__ = 'restructuredtext'
 
-class HSTWCS(SIP):
+class HSTWCS(WCS):
     """
     Purpose
     =======
@@ -32,7 +32,7 @@ class HSTWCS(SIP):
         `fobj`: PyFITS HDUList object or None
                 pyfits file object
         """
-        SIP.__init__(self, ehdr, fobj=fobj)
+        WCS.__init__(self, ehdr, fobj=fobj)
         self.setHDR0kw(hdr0)
         self.detector = self.setDetector(hdr0)
         self.inst_kw = ins_spec_kw
@@ -76,14 +76,14 @@ class HSTWCS(SIP):
         # Calculates the plate scale from the cd matrix
         # this may not be needed now and shoufl probably be done after all 
         # corrections
-        cd11 = self.cd[0][0]
-        cd21 = self.cd[1][0]
+        cd11 = self.wcs.cd[0][0]
+        cd21 = self.wcs.cd[1][0]
         return N.sqrt(N.power(cd11,2)+N.power(cd21,2)) * 3600.
     
     def setOrient(self):
         # Recompute ORIENTAT
-        cd12 = self.cd[0][1]
-        cd22 = self.cd[1][1]
+        cd12 = self.wcs.cd[0][1]
+        cd22 = self.wcs.cd[1][1]
         return RADTODEG(N.arctan2(cd12,cd22))
     
     def verifyPa_V3(self):
-- 
cgit