summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)