diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-12-12 18:57:59 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-12-12 18:57:59 (GMT) |
| commit | d0fe6df5fa3efa88adcd91973ebb8c0b6768937f (patch) | |
| tree | 9a1453a65a1c4473e3c50fee7ae9c5d77537dadd /tksao | |
| parent | 1843de8d4d8667ccf367930ee123eda6a8a55e56 (diff) | |
| download | blt-d0fe6df5fa3efa88adcd91973ebb8c0b6768937f.zip blt-d0fe6df5fa3efa88adcd91973ebb8c0b6768937f.tar.gz blt-d0fe6df5fa3efa88adcd91973ebb8c0b6768937f.tar.bz2 | |
upgrade AST
Diffstat (limited to 'tksao')
| -rw-r--r-- | tksao/frame/base.C | 4 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.C | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tksao/frame/base.C b/tksao/frame/base.C index ed69dd2..858d7f0 100644 --- a/tksao/frame/base.C +++ b/tksao/frame/base.C @@ -650,11 +650,11 @@ Matrix Base::calcAlignWCS(FitsImage* fits1, FitsImage* fits2, astBegin; // start memory management fits1->setWCSSystem(sys1); - AstFrameSet* wcs1 = (AstFrameSet*)astCopy(fits1->ast_); + AstFrameSet* wcs1 = fits1->wcsCopy(); astInvert(wcs1); fits2->setWCSSystem(sys2); - AstFrameSet* wcs2 = (AstFrameSet*)astCopy(fits2->ast_); + AstFrameSet* wcs2 = fits2->wcsCopy(); astInvert(wcs2); AstFrameSet* cvt = (AstFrameSet*)astConvert(wcs1, wcs2, ""); diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 0080272..6ba97ad 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -1671,11 +1671,11 @@ void FitsImage::match(const char* xxname1, const char* yyname1, if (sky1 != sky2) { setWCSSystem(sys1); setWCSSkyFrame(sky1); - AstFrameSet* wcs1 = (AstFrameSet*)astCopy(ast_); + AstFrameSet* wcs1 = wcsCopy(); setWCSSystem(sys2); setWCSSkyFrame(sky2); - AstFrameSet* wcs2 = (AstFrameSet*)astCopy(ast_); + AstFrameSet* wcs2 = wcsCopy(); AstFrameSet* cvt = (AstFrameSet*)astConvert(wcs1, wcs2, "SKY"); if (cvt != AST__NULL) { @@ -3682,8 +3682,6 @@ void FitsImage::astInit(FitsHead* hd, FitsHead* prim) case 4: break; } - - setWCSSkyFrame(Coord::FK5); } void FitsImage::wcsInit() |