diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-12-07 21:22:54 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-12-07 21:22:54 (GMT) |
| commit | 3fbb8a09c8befe6cc8678961155dfcd6447907b5 (patch) | |
| tree | 4e72f656e112c3ffc8750a70c2d9edbb5c0cafbf /tksao | |
| parent | 623ca5970335961993449414d54b605e54988f8b (diff) | |
| download | blt-3fbb8a09c8befe6cc8678961155dfcd6447907b5.zip blt-3fbb8a09c8befe6cc8678961155dfcd6447907b5.tar.gz blt-3fbb8a09c8befe6cc8678961155dfcd6447907b5.tar.bz2 | |
update AST WCS
Diffstat (limited to 'tksao')
| -rw-r--r-- | tksao/frame/fitsimage.C | 19 | ||||
| -rw-r--r-- | tksao/frame/projection.C | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 6831351..3f6b71c 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -3511,12 +3511,13 @@ int FitsImage::hasWCSEqu(Coord::CoordSystem sys) case 2: { int rr = astIsASkyFrame(ff); - // check for xLON/xLAT and xxLN/xxLT - // but GLON/GLAT is ok - const char* str = astGetC(ff, "System"); - if (!strncmp(str,"Unknown",7)) - rr = 0; - + // no xLON/xLAT and xxLN/xxLT but GLON/GLAT is ok + if (rr) { + const char* str = astGetC(ff, "System"); + if (!strncmp(str,"Unknown",7)) + rr = 0; + } + astEnd; return rr; } @@ -3568,9 +3569,9 @@ int FitsImage::hasWCSCel(Coord::CoordSystem sys) switch (naxes) { case 2: { - int rr = astIsASkyFrame(ff); - astEnd; - return rr; + int rr = astIsASkyFrame(ff); + astEnd; + return rr; } case 3: case 4: diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C index 10fbf7e..e294921 100644 --- a/tksao/frame/projection.C +++ b/tksao/frame/projection.C @@ -350,7 +350,7 @@ void Projection::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listNonCel(ptr, str, sys); break; default: - if (ptr->hasWCSEqu(sys)) { + if (ptr->hasWCSCel(sys)) { double ww = ptr->mapLenFromRef(width,sys,Coord::ARCSEC); switch (format) { case Coord::DEGREES: |