summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhack <hack@stsci.edu>2015-05-14 13:20:09 -0400
committerhack <hack@stsci.edu>2015-05-14 13:20:09 -0400
commita6164f4bbcdef912eb583bd2e4038a1e8e4951da (patch)
tree70472f6eeabf872ee4a3a2525433fc5f6d954b05
parent354c99daa69a8cc4eff3b081ec2c0cdce9df102c (diff)
downloadstwcs_hcf-a6164f4bbcdef912eb583bd2e4038a1e8e4951da.tar.gz
Update to ACS TDD apply_tdd2idc2015 code to eliminate use of zero-point from header and to only optionally use TDD term based on its presence in the IDCTAB header. All this was done based on discussions with Vera about the calibrations.
git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@39993 fe389314-cf27-0410-b35b-8c050e845b92
-rw-r--r--lib/stwcs/__init__.py2
-rw-r--r--lib/stwcs/updatewcs/corrections.py9
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/stwcs/__init__.py b/lib/stwcs/__init__.py
index 208644f..9f12bce 100644
--- a/lib/stwcs/__init__.py
+++ b/lib/stwcs/__init__.py
@@ -26,7 +26,7 @@ __docformat__ = 'restructuredtext'
from .version import *
try:
- import gui
+ from . import gui
teal.print_tasknames(gui.__name__, os.path.dirname(gui.__file__))
print('\n')
except:
diff --git a/lib/stwcs/updatewcs/corrections.py b/lib/stwcs/updatewcs/corrections.py
index e36dcd6..d3641eb 100644
--- a/lib/stwcs/updatewcs/corrections.py
+++ b/lib/stwcs/updatewcs/corrections.py
@@ -131,9 +131,12 @@ class TDDCorr(object):
skew_coeffs = hwcs.idcmodel.refpix['skew_coeffs']
delta_date = rday - skew_coeffs['TDD_DATE']
- hwcs.idcmodel.cx[1,1] = skew_coeffs['TDD_CXA'] + skew_coeffs['TDD_CXB']*delta_date
- hwcs.idcmodel.cy[1,1] = skew_coeffs['TDD_CTA'] + skew_coeffs['TDD_CTB']*delta_date
- hwcs.idcmodel.cy[1,0] = skew_coeffs['TDD_CYA'] + skew_coeffs['TDD_CYB']*delta_date
+ if skew_coeffs['TDD_CXB'] is not None:
+ hwcs.idcmodel.cx[1,1] += skew_coeffs['TDD_CXB']*delta_date
+ if skew_coeffs['TDD_CTB'] is not None:
+ hwcs.idcmodel.cy[1,1] += skew_coeffs['TDD_CTB']*delta_date
+ if skew_coeffs['TDD_CYB'] is not None:
+ hwcs.idcmodel.cy[1,0] += skew_coeffs['TDD_CYB']*delta_date
#print("CX[1,1]_TDD={}, CY[1,1]_TDD={}, CY[1,0]_TDD={}".format(hwcs.idcmodel.cx[1,1],hwcs.idcmodel.cy[1,1],hwcs.idcmodel.cy[1,0]))
apply_tdd2idc2015 = classmethod(apply_tdd2idc2015)