upgrade AST

6 files changed, 10 insertions, 10 deletions

diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index 563b110..ed69dd2 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -650,12 +650,13 @@ Matrix Base::calcAlignWCS(FitsImage* fits1, FitsImage* fits2,
   astBegin; // start memory management
 
   fits1->setWCSSystem(sys1);
-  fits2->setWCSSystem(sys2);
-
   AstFrameSet* wcs1 = (AstFrameSet*)astCopy(fits1->ast_);
-  AstFrameSet* wcs2 = (AstFrameSet*)astCopy(fits2->ast_);
   astInvert(wcs1);
+
+  fits2->setWCSSystem(sys2);
+  AstFrameSet* wcs2 = (AstFrameSet*)astCopy(fits2->ast_);
   astInvert(wcs2);
+
   AstFrameSet* cvt = (AstFrameSet*)astConvert(wcs1, wcs2, "");
   Matrix rr;
   if (cvt != AST__NULL) {
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index ef80247..7003af7 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -417,15 +417,16 @@ class FitsImage {
 #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);
-  AstFrameSet* getAST(Coord::CoordSystem sys) 
-    {return (ast_ && ast_[sys-Coord::WCS]) ? ast_[sys-Coord::WCS] : NULL;}
 #else
+  AstFrameSet* wcsCopy() {return (AstFrameSet*)ast_;}
   Vector wcsTran(const Vector&, int);
   Vector3d wcsTran(const Vector3d&, int);
   void wcsTran(int num, Vector* in, int forward, Vector* out)
@@ -438,7 +439,6 @@ class FitsImage {
   int wcsIsASkyFrame();
   void setWCSSystem(Coord::CoordSystem);
   void setWCSSkyFrame(Coord::SkyFrame);
-  AstFrameSet* getAST(Coord::CoordSystem sys) {return ast_;}
 #endif
 
   void setWCSFormat(AstFrameSet*, int, const char*);
diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C
index f8e6609..1794112 100644
--- a/tksao/frame/fitsmap.C
+++ b/tksao/frame/fitsmap.C
@@ -209,7 +209,6 @@ double FitsImage::mapLenFromRef(double dd, Coord::CoordSystem sys,
 	return 0;
       
       setWCSSystem(sys);
-      setWCSSkyFrame(Coord::FK5);
 
       Vector in[2];
       Vector out[2];
diff --git a/tksao/frame/grid25d.C b/tksao/frame/grid25d.C
index e6499c4..76238ff 100644
--- a/tksao/frame/grid25d.C
+++ b/tksao/frame/grid25d.C
@@ -65,7 +65,7 @@ int Grid25d::doit(RenderMode rm)
 #else
       fits->setWCSSystem(system_);
       fits->setWCSSkyFrame(sky_);
-      AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_));
+      AstFrameSet* ast = fits->wcsCopy();
 
       int naxes = astGetI(ast,"Naxes");
       switch (naxes) {
diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C
index bb72ac3..b787b87 100644
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
@@ -65,7 +65,7 @@ int Grid2d::doit(RenderMode rm)
 #else
       fits->setWCSSystem(system_);
       fits->setWCSSkyFrame(sky_);
-      AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_));
+      AstFrameSet* ast = fits->wcsCopy();
       
       int naxes = astGetI(ast,"Naxes");
       switch (naxes) {
diff --git a/tksao/frame/grid3d.C b/tksao/frame/grid3d.C
index 9e633bb..f482cb7 100644
--- a/tksao/frame/grid3d.C
+++ b/tksao/frame/grid3d.C
@@ -110,7 +110,7 @@ int Grid3d::doit(RenderMode rm)
 #else
       fits->setWCSSystem(system_);
       fits->setWCSSkyFrame(sky_);
-      AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_));
+      AstFrameSet* ast = fits->wcsCopy();
       
       int naxes = astGetI(ast,"Naxes");
       switch (naxes) {