diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-12-13 19:06:43 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-12-13 19:06:43 (GMT) |
| commit | 75488234583582af8356db0c54efe806851aa791 (patch) | |
| tree | b7bd08bc913c8269f0335fc561034885506735fa /tksao/frame/fitsimage.h | |
| parent | 6a72a59d69067fc834a08c2838d66a5d8a6873ee (diff) | |
| download | blt-75488234583582af8356db0c54efe806851aa791.zip blt-75488234583582af8356db0c54efe806851aa791.tar.gz blt-75488234583582af8356db0c54efe806851aa791.tar.bz2 | |
upgrade AST
Diffstat (limited to 'tksao/frame/fitsimage.h')
| -rw-r--r-- | tksao/frame/fitsimage.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h index 4a57975..03ed620 100644 --- a/tksao/frame/fitsimage.h +++ b/tksao/frame/fitsimage.h @@ -401,30 +401,25 @@ class FitsImage { void processKeywordsFitsSection(); int processKeywordsIRAF(FitsImage*); -#ifndef NEWWCS - WorldCoor* getWCS(Coord::CoordSystem sys) - {return (wcs_ && wcs_[sys-Coord::WCS]) ? wcs_[sys-Coord::WCS] : NULL;} -#endif - const char* getWCSName(Coord::CoordSystem); Coord::Orientation getWCSOrientation(Coord::CoordSystem, Coord::SkyFrame); double getWCSRotation(Coord::CoordSystem, Coord::SkyFrame); double getWCSDist(const Vector&, const Vector&, Coord::CoordSystem); + const char* getWCSName(Coord::CoordSystem); + #ifndef NEWWCS + WorldCoor* getWCS(Coord::CoordSystem sys) + {return (wcs_ && wcs_[sys-Coord::WCS]) ? wcs_[sys-Coord::WCS] : NULL;} Vector getWCScdelt(Coord::CoordSystem); -#else - double getWCSPixelSize(Coord::CoordSystem); - double getWCSPixelArea(Coord::CoordSystem); -#endif - -#ifndef NEWWCS AstFrameSet* getAST(Coord::CoordSystem sys) {return (ast_ && ast_[sys-Coord::WCS]) ? ast_[sys-Coord::WCS] : NULL;} + Vector wcsTran(AstFrameSet*, const Vector&, int); void wcsTran(AstFrameSet*, int, Vector*, int, Vector*); double wcsDistance(AstFrameSet*, const Vector&, const Vector&); int wcsIsASkyFrame(AstFrameSet*); void setWCSSkyFrame(AstFrameSet*, Coord::SkyFrame); + void setWCSFormat(AstFrameSet*, int, const char*); #else AstFrameSet* wcsCopy() {return (AstFrameSet*)astCopy(ast_);} Vector wcsTran(const Vector&, int); @@ -439,9 +434,11 @@ class FitsImage { int wcsIsASkyFrame(); void setWCSSystem(Coord::CoordSystem); void setWCSSkyFrame(Coord::SkyFrame); -#endif + void setWCSFormat(int, const char*); - void setWCSFormat(AstFrameSet*, int, const char*); + double getWCSPixelSize(Coord::CoordSystem); + double getWCSPixelArea(Coord::CoordSystem); +#endif int hasWCS(Coord::CoordSystem); int hasWCSEqu(Coord::CoordSystem); |