summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-09-18 17:07:31 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-09-18 17:07:31 (GMT)
commit3faaeb770717f6b872b73e0276691c4800ffdde6 (patch)
treee7b4bc056c8dd942fe10297106aef62904f96663
parent74c4621a012f71630462290a201aad6974afaa17 (diff)
downloadblt-3faaeb770717f6b872b73e0276691c4800ffdde6.zip
blt-3faaeb770717f6b872b73e0276691c4800ffdde6.tar.gz
blt-3faaeb770717f6b872b73e0276691c4800ffdde6.tar.bz2
new AST support
-rw-r--r--tksao/frame/grid2d.C12
1 files changed, 5 insertions, 7 deletions
diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C
index cd2a879..adaba37 100644
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
@@ -68,9 +68,9 @@ int Grid2d::doit(RenderMode rm)
break;
default:
{
-#ifndef NEWWCS
AstFrameSet* wcsfs = (AstFrameSet*)astCopy(fits->getAST(system_));
+#ifndef NEWWCS
// set desired skyformat
if (astIsASkyFrame(astGetFrame(wcsfs, AST__CURRENT)))
fits->setAstSkyFrame(wcsfs, sky_);
@@ -81,18 +81,16 @@ int Grid2d::doit(RenderMode rm)
astInvert(wcsfs);
astAddFrame(frameSet,2,astUnitMap(2,""),wcsfs);
astSetI(frameSet,"current",astGetI(frameSet,"nframe"));
- }
-#else
- AstFrameSet* wcs = (AstFrameSet*)astCopy(fits->getAST(system_));
+#else
// add wcs to frameset
// this will link frameset to wcs with unitMap
- astInvert(wcs);
- astAddFrame(frameSet,2,astUnitMap(2,""),wcs);
+ astInvert(wcsfs);
+ astAddFrame(frameSet,2,astUnitMap(2,""),wcsfs);
fits->setAstSystem(frameSet,system_);
fits->setAstSkyFrame(frameSet,sky_);
- }
#endif
+ }
}
astSet(frameSet,"Title=%s", " ");