diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-09-12 16:27:19 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-09-12 16:27:19 (GMT) |
| commit | abf1be7a92adbff06b37085aae3e976df578fb24 (patch) | |
| tree | 9910134a06b256916087355108627339174d29b6 /tksao | |
| parent | b86037666325a979f8e81d59dad358940620a323 (diff) | |
| download | blt-abf1be7a92adbff06b37085aae3e976df578fb24.zip blt-abf1be7a92adbff06b37085aae3e976df578fb24.tar.gz blt-abf1be7a92adbff06b37085aae3e976df578fb24.tar.bz2 | |
new AST support
Diffstat (limited to 'tksao')
| -rw-r--r-- | tksao/frame/fitsimage.C | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index ac3ee87..5e31736 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -2938,7 +2938,6 @@ Coord::Orientation FitsImage::getWCSOrientation(Coord::CoordSystem sys, // take the cross product and see which way the 3rd axis is pointing double w = east[0]*north[1]-east[1]*north[0]; - cerr << "old: " << radToDeg(w) << endl; if (!hasWCSCel(sys)) return w>0 ? Coord::NORMAL : Coord::XX; @@ -3449,6 +3448,7 @@ void FitsImage::astinit(int ii, FitsHead* hd, FitsHead* prim) // DSS,PLT,LIN goes straight to AST // we can't send 3D directly to AST +#ifndef NEWWCS if (wcs_[ii]->prjcode==WCS_DSS || wcs_[ii]->prjcode==WCS_PLT || (wcs_[ii]->prjcode==WCS_LIN && !strncmp(wcs_[ii]->ptype,"HPX",3)) || @@ -3457,11 +3457,14 @@ void FitsImage::astinit(int ii, FitsHead* hd, FitsHead* prim) (wcs_[ii]->prjcode==WCS_LIN && !strncmp(wcs_[ii]->c1type,"AST",3))) ast_[ii] = fits2ast(hd); else - ast_[ii] = fits2ast(hd); - // ast_[ii] = buildast(ii, hd, prim); + ast_[ii] = buildast(ii, hd, prim); if (!ast_[ii]) return; +#else + ast_[ii] = fits2ast(hd); + if (!ast_[ii]) + return; if (astIsASkyFrame(astGetFrame(ast_[ii], AST__CURRENT))) { if (astGetI(ast_[ii],"LatAxis") == 1) { @@ -3469,6 +3472,7 @@ void FitsImage::astinit(int ii, FitsHead* hd, FitsHead* prim) astPermAxes(ast_[ii],orr); } } +#endif // set default skyframe if (astIsASkyFrame(astGetFrame(ast_[ii], AST__CURRENT))) |