wcs speed improvements

2 files changed, 7 insertions, 20 deletions

diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C
index 74a6a26..bae2d0f 100644
--- a/tksao/frame/circle.C
+++ b/tksao/frame/circle.C
@@ -378,12 +378,12 @@ void Circle::listSAOimage(ostream& str, int strip)
   FitsImage* ptr = parent->findFits();
   listSAOimagePre(str);
 
-  str << type_ << '('
-      << setprecision(parent->precLinear_)
-      << ptr->mapFromRef(center,Coord::IMAGE) << ','
-      << setprecision(parent->precLenLinear_)
-      << annuli_[0][0] << ')';
-
+  str << type_ << '(';
+  ptr->listFromRef(str,center,Coord::IMAGE,Coord::FK5,Coord::DEGREES);
+  str << ',';
+  ptr->listLenFromRef(str,annuli_[0][0],Coord::IMAGE,Coord::DEGREE);
+  str << ')';
+  
   listSAOimagePost(str, strip);
 }
 
diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C
index 93d2584..a101044 100644
--- a/tksao/frame/marker.C
+++ b/tksao/frame/marker.C
@@ -1639,20 +1639,7 @@ void Marker::listXY(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 		    Coord::SkyFormat format, int strip)
 {
   FitsImage* ptr = parent->findFits();
-
-  switch (sys) {
-  case Coord::IMAGE:
-  case Coord::PHYSICAL:
-  case Coord::DETECTOR:
-  case Coord::AMPLIFIER:
-    str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys);
-    break;
-  default:
-    listWCS(ptr,center,sys,sky,format);
-    str << ra << ' ' << dec;
-    break;
-  }
-
+  ptr->listFromRef(str, center, sys, sky, format);
   str << (strip ? ';' : '\n');
 }