More code cleaning

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

1 files changed, 6 insertions, 24 deletions

diff --git a/wcsutil/instruments.py b/wcsutil/instruments.py
index c02c32d..afdf1a9 100644
--- a/wcsutil/instruments.py
+++ b/wcsutil/instruments.py
@@ -17,7 +17,8 @@ class InstrWCS(object):
         """
         This method MUST call all set_kw methods.
         There should be a set_kw method for all kw listed in 
-        mappings.ins_spec_kw
+        mappings.ins_spec_kw. TypeError handles the case when 
+        fobj='DEFAULT'.
         """
         self.set_idctab()
         self.set_offtab()
@@ -25,8 +26,6 @@ class InstrWCS(object):
         self.set_ra_targ()
         self.set_dec_targ()
         self.set_pav3()
-        #self.set_d2imfile()
-        
         self.set_detector()
         self.set_filter1()
         self.set_filter2()
@@ -68,13 +67,7 @@ class InstrWCS(object):
             self.dec_targ = self.primhdr['DEC-TARG']
         except (KeyError, TypeError):
             self.dec_targ = None
-    """        
-    def set_d2imfile(self):
-        try:
-            self.d2imfile = self.primhdr['D2IMFILE']
-        except (KeyError, TypeError):
-            self.d2imfile = None
-    """
+
     def set_pav3(self):
         try:
             self.pav3 = self.primhdr['PA_V3']
@@ -82,21 +75,18 @@ class InstrWCS(object):
             self.pav3 = None
             
     def set_filter1(self):
-        #self.filter1 = self.primhdr.get('FILTER1', None)
         try:
             self.filter1 = self.primhdr['FILTER1']
-        except:
+        except (KeyError, TypeError):
             self.filter1 = None
             
     def set_filter2(self):
-        #self.filter2 = self.primhdr.get('FILTER2', None) 
         try:
             self.filter2 = self.primhdr['FILTER2']
         except (KeyError, TypeError):
             self.filter2 = None
             
-    def set_vafactor(self):
-        #self.vafactor = self.exthdr.get('vafactor', 1) 
+    def set_vafactor(self): 
         try:
             self.vafactor = self.exthdr['VAFACTOR']
         except (KeyError, TypeError):
@@ -121,28 +111,24 @@ class InstrWCS(object):
                 self.naxis2 = None
                 
     def set_ltv1(self):
-        #self.ltv1 = self.exthdr.get('ltv1', 0.0)
         try:
             self.ltv1 = self.exthdr['LTV1']
         except (KeyError, TypeError):
             self.ltv1 = 0.0
         
     def set_ltv2(self):
-        #self.ltv2 = self.exthdr.get('ltv2', 0.0)
         try:
             self.ltv2 = self.exthdr['LTV2']
         except (KeyError, TypeError):
             self.ltv2 = 0.0
             
     def set_binned(self):
-        #self.binned = self.exthdr.get('BINAXIS1', 1)
         try:
             self.binned = self.exthdr['BINAXIS1']
         except (KeyError, TypeError):
             self.binned = 1
         
     def set_chip(self):
-        #self.chip = self.exthdr.get('CCDCHIP', 1)
         try:
             self.chip = self.exthdr['CCDCHIP']
         except (KeyError, TypeError):
@@ -173,11 +159,7 @@ class ACSWCS(InstrWCS):
         except KeyError:
             print 'ERROR: Detector kw not found.\n'
             raise
-        except TypeError:
-            #this is the case of creating a default HSTWCS object by 
-            #providing 'instrument' and 'detector'
-            pass
-    
+        
     def set_parity(self):
         parity = {'WFC':[[1.0,0.0],[0.0,-1.0]],
                 'HRC':[[-1.0,0.0],[0.0,1.0]],