diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-08-28 15:59:28 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-08-28 15:59:28 (GMT) |
| commit | 00a42ada7f65f3db70445e5ff3b3825d78dce2ee (patch) | |
| tree | 21262b9a5f1056aafde2ff48c0a2b4ba2c224a22 /tksao | |
| parent | 1d7ca7796fbfead236f2e21b31d805db7c97496d (diff) | |
| download | blt-00a42ada7f65f3db70445e5ff3b3825d78dce2ee.zip blt-00a42ada7f65f3db70445e5ff3b3825d78dce2ee.tar.gz blt-00a42ada7f65f3db70445e5ff3b3825d78dce2ee.tar.bz2 | |
fix wcs mapping issue
Diffstat (limited to 'tksao')
| -rw-r--r-- | tksao/frame/frame3dbase.C | 4 | ||||
| -rw-r--r-- | tksao/frame/framebase.C | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C index b9b919b..afc6df5 100644 --- a/tksao/frame/frame3dbase.C +++ b/tksao/frame/frame3dbase.C @@ -154,15 +154,13 @@ void Frame3dBase::getInfoCmd(const Vector& vv, Coord::InternalSystem ref, void Frame3dBase::getInfoWCS(char* var, Vector3d& rr, FitsImage* sptr) { - Vector3d img = rr * sptr->refToImage3d; - for (int ii=0; ii<MULTWCS; ii++) { char buf[128]; char ww = !ii ? '\0' : '`'+ii; Coord::CoordSystem www = (Coord::CoordSystem)(Coord::WCS+ii); if (hasWCS(www)) { - VectorStr3d out = sptr->mapFromRef(img, www, wcsSkyFrame_, wcsSkyFormat_); + VectorStr3d out = sptr->mapFromRef(rr, www, wcsSkyFrame_, wcsSkyFormat_); Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",x"),out[0],0); Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y"),out[1],0); diff --git a/tksao/frame/framebase.C b/tksao/frame/framebase.C index a40c5d6..3623f3f 100644 --- a/tksao/frame/framebase.C +++ b/tksao/frame/framebase.C @@ -136,15 +136,13 @@ void FrameBase::getInfoCmd(const Vector& vv, Coord::InternalSystem ref, void FrameBase::getInfoWCS(char* var, Vector& rr, FitsImage* sptr) { - Vector img = rr * sptr->refToImage; - for (int ii=0; ii<MULTWCS; ii++) { char buf[128]; char ww = !ii ? '\0' : '`'+ii; Coord::CoordSystem www = (Coord::CoordSystem)(Coord::WCS+ii); if (hasWCS(www)) { - VectorStr out = sptr->mapFromRef(img, www, wcsSkyFrame_, wcsSkyFormat_); + VectorStr out = sptr->mapFromRef(rr, www, wcsSkyFrame_, wcsSkyFormat_); Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",x"),out[0],0); Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y"),out[1],0); |