diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-09-28 20:30:56 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-09-28 20:30:56 (GMT) |
| commit | 7329da8b2b9290347146e9e2c02488d014eb8d65 (patch) | |
| tree | f198a9e77b8a92696dbda74b2e6a6ab9a9b11093 | |
| parent | 68a75013c4991c3ed0cef23c897b52adfd626c89 (diff) | |
| download | blt-7329da8b2b9290347146e9e2c02488d014eb8d65.zip blt-7329da8b2b9290347146e9e2c02488d014eb8d65.tar.gz blt-7329da8b2b9290347146e9e2c02488d014eb8d65.tar.bz2 | |
new AST WCS
| -rw-r--r-- | tksao/frame/basecommand.C | 4 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.C | 2 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.h | 2 | ||||
| -rw-r--r-- | tksao/frame/fitsmap.C | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C index 36e8814..ef20eec 100644 --- a/tksao/frame/basecommand.C +++ b/tksao/frame/basecommand.C @@ -1755,8 +1755,8 @@ void Base::getFitsSizeCmd(Coord::CoordSystem sys, Coord::SkyFrame sky, for (int ii=1; ii<4; ii++) wbb.bound(ww[ii]); - Vector ss(keyContext->fits->wcsdist(wbb.ll,wbb.lr(),sys), - keyContext->fits->wcsdist(wbb.ll,wbb.ul(),sys)); + Vector ss(keyContext->fits->getWCSDist(wbb.ll,wbb.lr(),sys), + keyContext->fits->getWCSDist(wbb.ll,wbb.ul(),sys)); ostringstream str; str << fixed; diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 12ae087..c1e7539 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -3307,7 +3307,7 @@ Vector* FitsImage::wcs2pix(Vector* in, int num, Coord::CoordSystem sys, return out; } -double FitsImage::wcsdist(Vector a, Vector b, Coord::CoordSystem sys) +double FitsImage::getWCSDist(Vector a, Vector b, Coord::CoordSystem sys) { int ss = sys-Coord::WCS; if (!(ss>=0 && ast_ && ast_[ss])) diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h index a96c68c..43ca5f8 100644 --- a/tksao/frame/fitsimage.h +++ b/tksao/frame/fitsimage.h @@ -363,7 +363,6 @@ class FitsImage { Vector wcs2pix(Vector, Coord::CoordSystem, Coord::SkyFrame); Vector* wcs2pix(Vector*, int, Coord::CoordSystem, Coord::SkyFrame); - double wcsdist(Vector, Vector, Coord::CoordSystem); double pix2wcsx(double, Coord::CoordSystem, int); double wcs2pixx(double, Coord::CoordSystem, int); @@ -388,6 +387,7 @@ class FitsImage { {return (wcs_ && wcs_[sys-Coord::WCS]) ? wcs_[sys-Coord::WCS]->wcsname : NULL;} Coord::Orientation getWCSOrientation(Coord::CoordSystem, Coord::SkyFrame); double getWCSRotation(Coord::CoordSystem, Coord::SkyFrame); + double getWCSDist(Vector, Vector, Coord::CoordSystem); #ifndef NEWWCS Vector getWCScdelt(Coord::CoordSystem); #else diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C index 9988fe3..11500f8 100644 --- a/tksao/frame/fitsmap.C +++ b/tksao/frame/fitsmap.C @@ -458,15 +458,15 @@ double FitsImage::mapDistFromRef(const Vector& vv1, const Vector& vv2, if (hasWCSCel(sys)) { switch (dist) { case Coord::DEGREE: - return wcsdist(v1,v2,sys); + return getWCSDist(v1,v2,sys); case Coord::ARCMIN: - return wcsdist(v1,v2,sys)*60; + return getWCSDist(v1,v2,sys)*60; case Coord::ARCSEC: - return wcsdist(v1,v2,sys)*60*60; + return getWCSDist(v1,v2,sys)*60*60; } } else - return wcsdist(v1,v2,sys); + return getWCSDist(v1,v2,sys); } } |