diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-11-11 20:37:34 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-11-11 20:37:34 (GMT) |
| commit | a5b249af576903c8120d899f554de474d3f2cefe (patch) | |
| tree | fcc30ac169f49a3e3edc85998e38d21c80db276d /tksao/frame | |
| parent | 6ca3a4e1b1110d4750e73b548227deeeab89a6f8 (diff) | |
| download | blt-a5b249af576903c8120d899f554de474d3f2cefe.zip blt-a5b249af576903c8120d899f554de474d3f2cefe.tar.gz blt-a5b249af576903c8120d899f554de474d3f2cefe.tar.bz2 | |
update AST WCS
Diffstat (limited to 'tksao/frame')
| -rw-r--r-- | tksao/frame/base.C | 9 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.C | 4 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.h | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/tksao/frame/base.C b/tksao/frame/base.C index 79f5802..de62ee0 100644 --- a/tksao/frame/base.C +++ b/tksao/frame/base.C @@ -642,7 +642,6 @@ Matrix Base::calcAlignWCS(FitsImage* fits1, FitsImage* fits2, Coord::CoordSystem sys1, Coord::CoordSystem sys2, Coord::SkyFrame sky) { - cerr << '*'; if ((!fits1 || !fits2) || (fits1 == fits2) || !(fits1->hasWCS(sys1)) || !(fits2->hasWCS(sys2))) return Matrix(); @@ -661,12 +660,8 @@ Matrix Base::calcAlignWCS(FitsImage* fits1, FitsImage* fits2, Matrix rr; if (cvt != AST__NULL) { astInvert(cvt); - Vector ll; - Vector cc1 = fits1->center(); - fits1->wcsTran(fits1->newast_, 1, cc1.v, cc1.v+1, 1, ll.v, ll.v+1); - Vector ur; - Vector cc2 = fits2->center(); - fits2->wcsTran(fits2->newast_, 1, cc2.v, cc2.v+1, 1, ur.v, ur.v+1); + Vector ll = fits1->wcsTran(fits1->newast_, fits1->center(), 1); + Vector ur = fits2->wcsTran(fits2->newast_, fits2->center(), 1); double fit[6]; double tol = 1; diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 9b3d99f..3f693fc 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -3995,7 +3995,7 @@ int FitsImage::wcsIsASkyFrame(AstFrameSet* ast) #endif #ifndef NEWWCS -Vector FitsImage::wcsTran(AstFrameSet* ast, Vector& in, int forward) +Vector FitsImage::wcsTran(AstFrameSet* ast, Vector in, int forward) { double xout, yout; astTran2(ast, 1, in.v, in.v+1, forward, &xout, &yout); @@ -4029,7 +4029,7 @@ void FitsImage::wcsTran(AstFrameSet* ast, int npoint, } #else -Vector FitsImage::wcsTran(AstFrameSet* ast, Vector& in, int forward) +Vector FitsImage::wcsTran(AstFrameSet* ast, Vector in, int forward) { int naxes = astGetI(ast,"Naxes"); switch (naxes) { diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h index 9a9d72a..e949184 100644 --- a/tksao/frame/fitsimage.h +++ b/tksao/frame/fitsimage.h @@ -400,7 +400,7 @@ class FitsImage { int wcsIsASkyFrame(AstFrameSet*); double wcsDistance(AstFrameSet*, double*, double*); - Vector wcsTran(AstFrameSet*, Vector&, int); + Vector wcsTran(AstFrameSet*, Vector, int); void wcsTran(AstFrameSet*, int, Vector*, int, Vector*); #ifdef NEWWCS void wcsTran(AstFrameSet*, int, const double*, const double*, int, |