update AST WCS

5 files changed, 21 insertions, 21 deletions

diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index 4d4488b..40148cd 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -649,8 +649,8 @@ Matrix Base::calcAlignWCS(FitsImage* fits1, FitsImage* fits2,
   astClearStatus; // just to make sure
   astBegin; // start memory management
 
-  fits1->setAstWCSSystem(fits1->newast_, sys1);
-  fits2->setAstWCSSystem(fits2->newast_, sys2);
+  fits1->setWCSSystem(fits1->newast_, sys1);
+  fits2->setWCSSystem(fits2->newast_, sys2);
 
   AstFrameSet* wcs1 = (AstFrameSet*)astCopy(fits1->newast_);
   AstFrameSet* wcs2 = (AstFrameSet*)astCopy(fits2->newast_);
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
index a8efe7f..b677935 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -1590,7 +1590,7 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
   for (int ii=0 ; ii<nyy2 ; ii++)
     Tcl_GetDoubleFromObj(interp_, objyy2[ii], yy2+ii);
 
-  setAstWCSSystem(newast_, sys1);
+  setWCSSystem(newast_, sys1);
   if (!wcsIsASkyFrame(newast_))
     return;
   setWCSSkyFrame(newast_, sky1);
@@ -1599,7 +1599,7 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
     iyy1[ii] *= M_PI/180.;
   }
 
-  setAstWCSSystem(newast_, sys2);
+  setWCSSystem(newast_, sys2);
   if (!wcsIsASkyFrame(newast_))
     return;
   setWCSSkyFrame(newast_, sky2);
@@ -1623,11 +1623,11 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
 
   if (sky1 != sky2) {
     AstFrameSet* wcs1 = (AstFrameSet*)astCopy(newast_);
-    setAstWCSSystem(wcs1, sys1);
+    setWCSSystem(wcs1, sys1);
     setWCSSkyFrame(wcs1,sky1);
 
     AstFrameSet* wcs2 = (AstFrameSet*)astCopy(newast_);
-    setAstWCSSystem(wcs2, sys2);
+    setWCSSystem(wcs2, sys2);
     setWCSSkyFrame(wcs2,sky2);
 
     AstFrameSet* cvt = (AstFrameSet*)astConvert(wcs1, wcs2, "SKY");
@@ -1640,7 +1640,7 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
   }
 
   // now compare
-  setAstWCSSystem(newast_, sys2);
+  setWCSSystem(newast_, sys2);
   setWCSSkyFrame(newast_, sky2);
   Tcl_Obj* objrr = Tcl_NewListObj(0,NULL);
   for(int jj=0; jj<nxx2; jj++) {
@@ -2906,7 +2906,7 @@ double FitsImage::getWCSPixelSize(Coord::CoordSystem sys)
     return 0;
 
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_, sys);
+  setWCSSystem(newast_, sys);
   
   Vector cc = center();
   double xx[3], wxx[3];
@@ -2942,7 +2942,7 @@ double FitsImage::getWCSPixelArea(Coord::CoordSystem sys)
     return 0;
 
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_, sys);
+  setWCSSystem(newast_, sys);
 
   Vector cc = center();
   double xx[3], wxx[3];
@@ -3013,7 +3013,7 @@ Coord::Orientation FitsImage::getWCSOrientation(Coord::CoordSystem sys,
     return Coord::NORMAL;
   
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_,sys);
+  setWCSSystem(newast_,sys);
   setWCSSkyFrame(newast_,sky);
 
   Vector pp = center();
@@ -3077,7 +3077,7 @@ double FitsImage::getWCSRotation(Coord::CoordSystem sys, Coord::SkyFrame sky)
     return 0;
   
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_,sys);
+  setWCSSystem(newast_,sys);
   setWCSSkyFrame(newast_,sky);
 
   Vector pp = center();
@@ -3152,7 +3152,7 @@ Vector FitsImage::pix2wcs(Vector in, Coord::CoordSystem sys,
   }
   
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_,sys);
+  setWCSSystem(newast_,sys);
   setWCSSkyFrame(newast_,sky);
   maperr =0;
 
@@ -3250,7 +3250,7 @@ char* FitsImage::pix2wcs(Vector in, Coord::CoordSystem sys,
   }
   
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_,sys);
+  setWCSSystem(newast_,sys);
   setWCSSkyFrame(newast_,sky);
   maperr =0;
 
@@ -3343,7 +3343,7 @@ Vector FitsImage::wcs2pix(Vector in, Coord::CoordSystem sys,
   }
     
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_,sys);
+  setWCSSystem(newast_,sys);
   setWCSSkyFrame(newast_,sky);
   maperr =0;
 
@@ -3389,7 +3389,7 @@ double FitsImage::getWCSDist(Vector aa, Vector bb, Coord::CoordSystem sys)
     return 0;
 
   astClearStatus; // just to make sure
-  setAstWCSSystem(newast_,sys);
+  setWCSSystem(newast_,sys);
 
   double rr=0;
   if (wcsIsASkyFrame(newast_)) {
@@ -3720,7 +3720,7 @@ void FitsImage::astinit(int ss, FitsHead* hd, FitsHead* prim)
   if (!ast_[ss])
     return;
 
-  setAstWCSSystem(ast_[ss], (Coord::CoordSystem)(ss+Coord::WCS));
+  setWCSSystem(ast_[ss], (Coord::CoordSystem)(ss+Coord::WCS));
 
   //  astClearStatus; // just to make sure
   //  astBegin; // start memory management
@@ -3935,7 +3935,7 @@ void FitsImage::setWCSSkyFrame(AstFrameSet* ast, Coord::SkyFrame sky)
 }
 
 #ifdef NEWWCS
-void FitsImage::setAstWCSSystem(AstFrameSet* ast, Coord::CoordSystem sys)
+void FitsImage::setWCSSystem(AstFrameSet* ast, Coord::CoordSystem sys)
 {
   return;
   int nn = astGetI(ast,"nframe");
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index 7d719de..b0b260b 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -408,7 +408,7 @@ class FitsImage {
 #endif
   
 #ifdef NEWWCS
-  void setAstWCSSystem(AstFrameSet*, Coord::CoordSystem);
+  void setWCSSystem(AstFrameSet*, Coord::CoordSystem);
 #endif
   void setWCSSkyFrame(AstFrameSet*, Coord::SkyFrame);
   void setWCSFormat(AstFrameSet*, int, const char*);
diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C
index f9b220b..3629f0e 100644
--- a/tksao/frame/fitsmap.C
+++ b/tksao/frame/fitsmap.C
@@ -175,7 +175,7 @@ double FitsImage::mapLenFromRef(double dd, Coord::CoordSystem sys,
       }
       
       astClearStatus; // just to make sure
-      setAstWCSSystem(newast_, sys);
+      setWCSSystem(newast_, sys);
       maperr =0;
 
       Vector cc = center();
@@ -291,7 +291,7 @@ double FitsImage::mapLenToRef(double dd, Coord::CoordSystem sys,
       }
       
       astClearStatus; // just to make sure
-      setAstWCSSystem(newast_, sys);
+      setWCSSystem(newast_, sys);
       maperr =0;
 
       double rdd = dd;
diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C
index 095cc3c..dfa3c54 100644
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
@@ -84,7 +84,7 @@ int Grid2d::doit(RenderMode rm)
 #else
       AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_));
 
-      fits->setAstWCSSystem(ast, system_);
+      fits->setWCSSystem(ast, system_);
       fits->setWCSSkyFrame(ast, sky_);
       
       int naxes = astGetI(ast,"Naxes");