diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-09-15 18:45:01 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-09-15 18:45:01 (GMT) |
| commit | 3fc19fef08eb015fca285f1549a89cbdef17cfd0 (patch) | |
| tree | f916aca54e745d49e016250189ccbe9e5b76b6b1 | |
| parent | e89152d5510b89fc747f96a1bdfaa381536b2993 (diff) | |
| download | blt-3fc19fef08eb015fca285f1549a89cbdef17cfd0.zip blt-3fc19fef08eb015fca285f1549a89cbdef17cfd0.tar.gz blt-3fc19fef08eb015fca285f1549a89cbdef17cfd0.tar.bz2 | |
new AST support
| -rw-r--r-- | tksao/frame/fitsimage.C | 8 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.h | 2 | ||||
| -rw-r--r-- | tksao/frame/grid2d.C | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 0c6b26b..f6395c5 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -3470,7 +3470,8 @@ void FitsImage::astinit(int ii, FitsHead* hd, FitsHead* prim) if (!ast_[ii]) return; - // astShow(ast_[ii]); + setAstSystem(ast_[ii], (Coord::CoordSystem)(ii+Coord::WCS)); + int naxes = astGetI(ast_[ii],"Naxes"); switch (naxes) { case 1: @@ -3544,8 +3545,7 @@ void FitsImage::setAstFormat(AstFrameSet* aa, int id, const char* format) } #ifdef NEWWCS -void FitsImage::setAstSystem(AstFrameSet* fs, Coord::CoordSystem sys, - Coord::SkyFrame sky) +void FitsImage::setAstSystem(AstFrameSet* fs, Coord::CoordSystem sys) { int nn = astGetI(fs,"nframe"); char cc = ' '; @@ -3570,8 +3570,6 @@ void FitsImage::setAstSystem(AstFrameSet* fs, Coord::CoordSystem sys, break; } } - - setAstSkyFrame(fs,sky); } #endif diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h index 39bf8ae..a96c479 100644 --- a/tksao/frame/fitsimage.h +++ b/tksao/frame/fitsimage.h @@ -391,7 +391,7 @@ class FitsImage { Vector getWCScdelt(Coord::CoordSystem); #ifdef NEWWCS - void setAstSystem(AstFrameSet*, Coord::CoordSystem, Coord::SkyFrame); + void setAstSystem(AstFrameSet*, Coord::CoordSystem); #endif void setAstSkyFrame(AstFrameSet*, Coord::SkyFrame); void setAstFormat(AstFrameSet*, int, const char*); diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C index 31a0028..cd2a879 100644 --- a/tksao/frame/grid2d.C +++ b/tksao/frame/grid2d.C @@ -89,7 +89,8 @@ int Grid2d::doit(RenderMode rm) // this will link frameset to wcs with unitMap astInvert(wcs); astAddFrame(frameSet,2,astUnitMap(2,""),wcs); - fits->setAstSystem(frameSet,system_,sky_); + fits->setAstSystem(frameSet,system_); + fits->setAstSkyFrame(frameSet,sky_); } #endif } |