From 2ef0aacf55807bf346014b224f2139d9c67a4522 Mon Sep 17 00:00:00 2001 From: dencheva Date: Fri, 18 Dec 2009 17:01:35 +0000 Subject: Minor refactoring and cleaning; fixed a problem when ORIENTAT is not present in the header. Tests against makewcs pass for all instruments. git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stsci_python/trunk/stwcs@8507 fe389314-cf27-0410-b35b-8c050e845b92 --- updatewcs/apply_corrections.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'updatewcs') diff --git a/updatewcs/apply_corrections.py b/updatewcs/apply_corrections.py index be9fac7..ab05d7d 100644 --- a/updatewcs/apply_corrections.py +++ b/updatewcs/apply_corrections.py @@ -27,15 +27,18 @@ def setCorrections(fname, vacorr=True, tddcorr=True, dgeocorr=True, d2imcorr=Tru for the instrument, which are defined in mappings.py. """ instrument = pyfits.getval(fname, 'INSTRUME') - tddcorr = applyTDDCorr(fname, tddcorr) - dgeocorr = applyDgeoCorr(fname, dgeocorr) - d2imcorr = applyD2ImCorr(fname, d2imcorr) # make a copy of this list ! acorr = allowed_corrections[instrument][:] if 'VACorr' in acorr and vacorr==False: acorr.remove('VACorr') - if 'TDDCorr' in acorr and tddcorr==False: acorr.remove('TDDCorr') - if 'DGEOCorr' in acorr and dgeocorr==False: acorr.remove('DGEOCorr') - if 'DET2IMCorr' in acorr and d2imcorr==False: acorr.remove('DET2IMCorr') + if 'TDDCorr' in acorr: + tddcorr = applyTDDCorr(fname, tddcorr) + if tddcorr == False: acorr.remove('TDDCorr') + if 'DGEOCorr' in acorr: + dgeocorr = applyDgeoCorr(fname, dgeocorr) + if dgeocorr == False: acorr.remove('DGEOCorr') + if 'DET2IMCorr' in acorr: + d2imcorr = applyD2ImCorr(fname, d2imcorr) + if d2imcorr == False: acorr.remove('DET2IMCorr') return acorr def applyTDDCorr(fname, utddcorr): -- cgit