diff options
| author | hack <hack@stsci.edu> | 2014-04-02 16:03:23 -0400 |
|---|---|---|
| committer | hack <hack@stsci.edu> | 2014-04-02 16:03:23 -0400 |
| commit | 49ed98f36b448b2ed06df373df0df3615395d45a (patch) | |
| tree | 13a9afb2564d31b91dd7d059f1c83d9c8c14a2f5 | |
| parent | 36201df3fe7378d0a181bcbae5195f8f296c13bf (diff) | |
| download | stwcs_hcf-49ed98f36b448b2ed06df373df0df3615395d45a.tar.gz | |
Support has been added for optional TDD Alpha term to be read in from IDCTAB primary header for new (non-Jay Anderson) TDD correction.
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@30795 fe389314-cf27-0410-b35b-8c050e845b92
| -rw-r--r-- | lib/stwcs/distortion/mutil.py | 7 | ||||
| -rw-r--r-- | lib/stwcs/updatewcs/corrections.py | 7 | ||||
| -rw-r--r-- | setup.cfg | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/stwcs/distortion/mutil.py b/lib/stwcs/distortion/mutil.py index ea131f9..07ec9b4 100644 --- a/lib/stwcs/distortion/mutil.py +++ b/lib/stwcs/distortion/mutil.py @@ -262,13 +262,18 @@ def read_tdd_coeffs(phdr, chip=1): skew_coeffs['TDD_A'] = None skew_coeffs['TDD_B'] = None skew_coeffs['TDD_CY_BETA'] = None + skew_coeffs['TDD_CY_ALPHA'] = None if "TDD_CYB1" in phdr: # We have 2014-calibrated TDD correction to apply, not J.A.-derived values print "Using 2014-calibrated TDD correction..." skew_coeffs['TDD_DATE'] = phdr['TDD_DATE'] cyb_kw = 'TDD_CYB{0}'.format(int(chip)) - skew_coeffs['TDD_CY_BETA'] = phdr[cyb_kw] + skew_coeffs['TDD_CY_BETA'] = phdr.get(cyb_kw,None) + cya_kw = 'TDD_CYA{0}'.format(int(chip)) + tdd_cya = phdr.get(cya_kw,None) + if tdd_cya == 0 or tdd_cya == 'N/A': tdd_cya = None + skew_coeffs['TDD_CY_ALPHA'] = tdd_cya else: if "TDDORDER" in phdr: n = int(phdr["TDDORDER"]) diff --git a/lib/stwcs/updatewcs/corrections.py b/lib/stwcs/updatewcs/corrections.py index 6dc2ecd..f9e0b38 100644 --- a/lib/stwcs/updatewcs/corrections.py +++ b/lib/stwcs/updatewcs/corrections.py @@ -104,8 +104,11 @@ class TDDCorr(object): skew_coeffs = hwcs.idcmodel.refpix['skew_coeffs'] cy_beta = skew_coeffs['TDD_CY_BETA'] - - hwcs.idcmodel.cy[1,1] += cy_beta*(rday - skew_coeffs['TDD_DATE']) + cy_alpha = skew_coeffs['TDD_CY_ALPHA'] + if cy_alpha is None: + hwcs.idcmodel.cy[1,1] += cy_beta*(rday - skew_coeffs['TDD_DATE']) + else: + hwcs.idcmodel.cy[1,1] = cy_alpha + cy_beta*(rday - skew_coeffs['TDD_DATE']) apply_tdd2idc2 = classmethod(apply_tdd2idc2) @@ -1,6 +1,6 @@ [metadata] name = stwcs -version = 1.1.3.dev +version = 1.1.4.dev author = Nadia Dencheva, Warren Hack author-email = help@stsci.edu summary = Recomputes the WCS of an HST observation and puts all distortion |