Removed wcs_pix2sky method, detector to image correction is not applied in this case.

Added sip2foc method.
Added 'minerr' parameter to HSTWCS class to allow switching distortion application off
Added docstrings.
Changed imports of numpy 


git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/development/trunk/updatewcs@7804 fe389314-cf27-0410-b35b-8c050e845b92

1 files changed, 7 insertions, 9 deletions

diff --git a/wcsutil/instruments.py b/wcsutil/instruments.py
index 6d41e2a..7ac18f4 100644
--- a/wcsutil/instruments.py
+++ b/wcsutil/instruments.py
@@ -1,5 +1,4 @@
 import pyfits
-import numpy as N
 #from .. mappings import ins_spec_kw
 from mappings import ins_spec_kw, prim_hdr_kw
     
@@ -88,6 +87,8 @@ class InstrWCS(object):
         # in a different header, so this is to be handled by the instrument classes 
         pass
         
+
+        
 class ACSWCS(InstrWCS):
     """
     get instrument specific kw    
@@ -220,11 +221,7 @@ class NICMOSWCS(InstrWCS):
     def set_filter2(self):
         #Nicmos idc tables do not allow 2 filters.
         self.filter2 = 'CLEAR'
-        """
-        self.filter2 = self.primhdr.get('FILTER2', None)
-        if self.filter2 == " " or self.filter2 == None:
-            self.filter2 = 'CLEAR2'
-        """
+        
     def set_chip(self):
         self.chip = self.detector
             
@@ -237,7 +234,7 @@ class NICMOSWCS(InstrWCS):
     
 class STISWCS(InstrWCS):
     """
-    Create a NICMOS specific class
+    A STIS specific class
     """
     
     def __init__(self, hdr0, hdr):
@@ -245,7 +242,7 @@ class STISWCS(InstrWCS):
         self.exthdr = hdr
         InstrWCS.__init__(self,hdr0, hdr)
         self.set_ins_spec_kw()
-    
+        
     def set_parity(self):
         self.parity = [[-1.0,0.],[0.,1.0]]
         
@@ -264,4 +261,5 @@ class STISWCS(InstrWCS):
             self.detector = self.primhdr['DETECTOR']  
         except KeyError:
             print 'ERROR: Detector kw not found.\n'
-            raise
\ No newline at end of file
+            raise
+