From 28de41b7743e154e7e30e2ddf3693e67c439f5d4 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 2 Nov 2017 15:32:30 -0400 Subject: update AST WCS --- tksao/frame/fitsimage.C | 50 ++++++++++++++++++++++++------------------------- tksao/frame/fitsmap.C | 4 ++-- tksao/frame/grid25d.C | 2 +- tksao/frame/grid2d.C | 2 +- tksao/frame/grid3d.C | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index acf21b0..022fd8f 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -1446,7 +1446,7 @@ void FitsImage::match(const char* xxname1, const char* yyname1, if (!(ss>=0 && ast_ && ast_[ss])) return; - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky1); for (int ii=0; ii=0 && ast_ && ast_[ss])) return; - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky2); for (int ii=0; ii=0 ? Coord::NORMAL : Coord::XX; else rr = ang<=0 ? Coord::NORMAL : Coord::XX; @@ -3071,7 +3071,7 @@ double FitsImage::getWCSRotation(Coord::CoordSystem sys, Coord::SkyFrame sky) astClearStatus; // just to make sure - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) + if (astWCSIsASkyFrame(ast_[ss])) setAstWCSSkyFrame(ast_[ss],sky); Vector pp = center(); @@ -3126,7 +3126,7 @@ Vector FitsImage::pix2wcs(Vector in, Coord::CoordSystem sys, if (ss>=0 && ast_ && ast_[ss]) { double xx =0; double yy =0; - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky); astWCSTran(ast_[ss], 1, in.v, in.v+1, 1, &xx, &yy); if (astOK) @@ -3162,7 +3162,7 @@ Vector* FitsImage::pix2wcs(Vector* in, int num, Coord::CoordSystem sys, int ss = sys-Coord::WCS; if (ss>=0 && ast_ && ast_[ss]) { - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky); astWCSTran(ast_[ss], num, xin, yin, 1, xout, yout); if (astOK) { @@ -3198,7 +3198,7 @@ char* FitsImage::pix2wcs(Vector in, Coord::CoordSystem sys, double xx =0; double yy =0; ostringstream str; - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky); astWCSTran(ast_[ss], 1, in.v, in.v+1, 1, &xx, &yy); if (!astOK || !checkAstWCS(xx,yy)) { @@ -3265,7 +3265,7 @@ Vector FitsImage::wcs2pix(Vector in, Coord::CoordSystem sys, if (ss>=0 && ast_ && ast_[ss]) { double xx =0; double yy =0; - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky); Vector rr = in*M_PI/180.; astWCSTran(ast_[ss], 1, rr.v, &(rr[1]), 0, &xx, &yy); @@ -3302,7 +3302,7 @@ Vector* FitsImage::wcs2pix(Vector* in, int num, Coord::CoordSystem sys, int ss = sys-Coord::WCS; if (ss>=0 && ast_ && ast_[ss]) { - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { setAstWCSSkyFrame(ast_[ss],sky); for (int kk=0; kk=0 && ast_ && ast_[ss]) - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { // special case of xLON/xLAT char* bb = &(wcs_[ss]->c1type[1]); if (!strncmp(bb,"LON",3) || !strncmp(bb,"LAT",3)) { @@ -3396,7 +3396,7 @@ int FitsImage::hasWCSEqu(Coord::CoordSystem sys) int ss = sys-Coord::WCS; if (ss>=0 && ast_ && ast_[ss]) - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { // check for xLON/xLAT and xxLN/xxLT // but GLON/GLAT is ok const char* str = astGetC(ast_[ss], "System"); @@ -3416,7 +3416,7 @@ int FitsImage::hasWCSCel(Coord::CoordSystem sys) int ss = sys-Coord::WCS; if (ss>=0 && ast_ && ast_[ss]) - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) + if (astWCSIsASkyFrame(ast_[ss])) return 1; return 0; @@ -3538,10 +3538,10 @@ void FitsImage::astinit(int ss, FitsHead* hd, FitsHead* prim) case 1: break; case 2: - if (astIsASkyFrame(ast_[ss]) && astGetI(ast_[ss],"LatAxis") == 1) { + if (astIsASkyFrame(astGetFrame(ast_[ss],AST__CURRENT)) && + astGetI(ast_[ss],"LatAxis") == 1) { int orr[] = {2,1}; astPermAxes(ast_[ss],orr); - // astSetI(ast_[ss],"Current",2); } break; case 3: @@ -3572,7 +3572,7 @@ void FitsImage::astinit(int ss, FitsHead* hd, FitsHead* prim) #endif // set default skyframe - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) + if (astWCSIsASkyFrame(ast_[ss])) setAstWCSSkyFrame(ast_[ss],Coord::FK5); } @@ -3589,7 +3589,7 @@ void FitsImage::astinit0(int ss, FitsHead* hd, FitsHead* prim) return; // set default skyframe - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) + if (astWCSIsASkyFrame(ast_[ss])) setAstWCSSkyFrame(ast_[ss],Coord::FK5); } @@ -3619,7 +3619,7 @@ void FitsImage::setAstWCSFormat(AstFrameSet* aa, int id, const char* format) void FitsImage::setAstWCSSkyFrame(AstFrameSet* ast, Coord::SkyFrame sky) { // is sky frame - if (!astWCSIsASkyFrame(astGetFrame(ast, AST__CURRENT))) + if (!astWCSIsASkyFrame(ast)) return; // is it already set? @@ -3680,7 +3680,7 @@ void FitsImage::setAstWCSSkyFrame(AstFrameSet* ast, Coord::SkyFrame sky) int FitsImage::astWCSIsASkyFrame(void* ast) { - return astIsASkyFrame(ast); + return astIsASkyFrame(astGetFrame(ast,AST__CURRENT)); } void FitsImage::astWCSTran(AstFrameSet* ast, int npoint, @@ -3700,7 +3700,7 @@ int FitsImage::astWCSIsASkyFrame(void* ast) case 1: return 0; case 2: - return astIsASkyFrame(ast); + return astIsASkyFrame(astGetFrame(ast,AST__CURRENT)); case 3: case 4: { diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C index a1bf5c7..e3eefd6 100644 --- a/tksao/frame/fitsmap.C +++ b/tksao/frame/fitsmap.C @@ -191,7 +191,7 @@ double FitsImage::mapLenFromRef(double dd, Coord::CoordSystem sys, pt1[1] = wyy[1]; double out = astDistance(ast_[ss],pt0,pt1); - if (astWCSIsASkyFrame(astGetFrame(ast_[ss], AST__CURRENT))) { + if (astWCSIsASkyFrame(ast_[ss])) { out = radToDeg(out); switch (dist) { case Coord::DEGREE: @@ -291,7 +291,7 @@ double FitsImage::mapLenToRef(double dd, Coord::CoordSystem sys, AstFrameSet* ast = (AstFrameSet*)astCopy(ast_[ss]); double rdd = dd; - if (astWCSIsASkyFrame(astGetFrame(ast, AST__CURRENT))) { + if (astWCSIsASkyFrame(ast)) { rdd = degToRad(dd); switch (dist) { case Coord::DEGREE: diff --git a/tksao/frame/grid25d.C b/tksao/frame/grid25d.C index 25b8d87..ec34d32 100644 --- a/tksao/frame/grid25d.C +++ b/tksao/frame/grid25d.C @@ -67,7 +67,7 @@ int Grid25d::doit(RenderMode rm) // Get 2D SkyFrame AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_)); - if (fits->astWCSIsASkyFrame(astGetFrame(ast, AST__CURRENT))) + if (fits->astWCSIsASkyFrame(ast)) fits->setAstWCSSkyFrame(ast, sky_); // Record the index of the current Frame diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C index ed2c55d..6d5bf22 100644 --- a/tksao/frame/grid2d.C +++ b/tksao/frame/grid2d.C @@ -72,7 +72,7 @@ int Grid2d::doit(RenderMode rm) #ifndef NEWWCS // set desired skyformat - if (fits->astWCSIsASkyFrame(astGetFrame(ast, AST__CURRENT))) + if (fits->astWCSIsASkyFrame(ast)) fits->setAstWCSSkyFrame(ast, sky_); // add wcs to frameset diff --git a/tksao/frame/grid3d.C b/tksao/frame/grid3d.C index d3f83ba..96f13d8 100644 --- a/tksao/frame/grid3d.C +++ b/tksao/frame/grid3d.C @@ -100,7 +100,7 @@ int Grid3d::doit(RenderMode rm) // Get 2D SkyFrame AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_)); - if (fits->astWCSIsASkyFrame(astGetFrame(ast, AST__CURRENT))) + if (fits->astWCSIsASkyFrame(ast)) fits->setAstWCSSkyFrame(ast, sky_); // Record the index of the current Frame -- cgit v0.12