clean up region list code

14 files changed, 75 insertions, 108 deletions

diff --git a/tksao/frame/annulus.C b/tksao/frame/annulus.C
index a1881bd..69b64ab 100644
--- a/tksao/frame/annulus.C
+++ b/tksao/frame/annulus.C
@@ -326,7 +326,7 @@ void Annulus::listPros(ostream& str, Coord::CoordSystem sys,
     {
       Vector vv = ptr->mapFromRef(center,sys);
       coord.listProsCoordSystem(str,sys,sky);
-      str << "; " << type_ << ' ' << setprecision(8) << vv;
+      str << "; " << type_ << ' ' << vv;
       for (int ii=0; ii<numAnnuli_; ii++) {
 	double rr = ptr->mapLenFromRef(annuli_[ii][0],Coord::IMAGE);
 	str << ' ' << rr;
@@ -340,25 +340,21 @@ void Annulus::listPros(ostream& str, Coord::CoordSystem sys,
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
 	  coord.listProsCoordSystem(str,sys,sky);
-	  str << "; " << type_ << ' ' << setprecision(10) << setunit('d') << vv
-	      << setprecision(3) << fixed;
+	  str << "; " << type_ << ' ' << setunit('d') << vv;
 	  for (int ii=0; ii<numAnnuli_; ii++) {
 	    double rr = ptr->mapLenFromRef(annuli_[ii][0],sys,Coord::ARCSEC);
 	    str << ' ' << rr << '"';
 	  }
-	  str.unsetf(ios_base::floatfield);
 	}
 	break;
       case Coord::SEXAGESIMAL:
 	listRADECPros(ptr,center,sys,sky,format);
 	coord.listProsCoordSystem(str,sys,sky);
-	str << "; " << type_ << ' ' << ra << ' ' << dec
-	    << setprecision(3) << fixed;
+	str << "; " << type_ << ' ' << ra << ' ' << dec;
 	for (int ii=0; ii<numAnnuli_; ii++) {
 	  double rr = ptr->mapLenFromRef(annuli_[ii][0],sys,Coord::ARCSEC);
 	  str << ' ' << rr << '"';
 	}
-	str.unsetf(ios_base::floatfield);
 	break;
       }
     }
@@ -373,7 +369,7 @@ void Annulus::listSAOimage(ostream& str, int strip)
   listSAOimagePre(str);
 
   Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-  str << type_ << '(' << setprecision(8) << vv;
+  str << type_ << '(' << vv;
   for (int ii=0; ii<numAnnuli_; ii++) {
     double rr = ptr->mapLenFromRef(annuli_[ii][0],Coord::IMAGE);
     str << ',' << rr;
diff --git a/tksao/frame/box.C b/tksao/frame/box.C
index 0497735..cbd40e5 100644
--- a/tksao/frame/box.C
+++ b/tksao/frame/box.C
@@ -281,8 +281,7 @@ void Box::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	break;
       case Coord::SEXAGESIMAL:
 	listRADEC(ptr,center,sys,sky,format);
-	str << type_ << '(' << setprecision(8)
-	    << ra << ',' << dec << ',' 
+	str << type_ << '(' << ra << ',' << dec << ',' 
 	    << setprecision(3) << fixed << setunit('"') << rr << ',';
 	str.unsetf(ios_base::floatfield);
 	str << setprecision(8) << radToDeg(aa) << ')';
@@ -365,8 +364,7 @@ void Box::listCiao(ostream& str, Coord::CoordSystem sys, int strip)
     if (ptr->hasWCSCel(sys)) {
       listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL);
       Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCMIN);
-      str << type_ << '('
-	  << ra << ',' << dec << ',' 
+      str << type_ << '(' << ra << ',' << dec << ',' 
 	  << setprecision(5) << fixed << setunit('\'') << rr << ',';
       str.unsetf(ios_base::floatfield);
       str << setprecision(8) << radToDeg(angle) << ')';
diff --git a/tksao/frame/boxannulus.C b/tksao/frame/boxannulus.C
index f99e190..0b6d35f 100644
--- a/tksao/frame/boxannulus.C
+++ b/tksao/frame/boxannulus.C
@@ -291,7 +291,7 @@ void BoxAnnulus::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << "box(" << setprecision(8) << vv
+	  str << "box(" << setprecision(10) << vv
 	      << setprecision(3) << fixed;
 	  for (int ii=0; ii<numAnnuli_; ii++) {
 	    Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
@@ -369,13 +369,11 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys,
 	str << "; ";
 
 	Vector rr = ptr->mapLenFromRef(annuli_[ii],Coord::IMAGE);
-	str << "box " << setprecision(8) << vv << ' ' << rr << ' ' 
-	    << radToDeg(angle);
+	str << "box " << vv << ' ' << rr << ' ' << radToDeg(angle);
 
 	if (ii!=0) {
 	  Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],Coord::IMAGE);
-	  str << " & !box " << setprecision(8) << vv << ' ' << r1 << ' ' 
-	      << radToDeg(angle);
+	  str << " & !box " << vv << ' ' << r1 << ' ' << radToDeg(angle);
 	}
 
 	listProsPost(str, strip);
@@ -393,19 +391,13 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys,
 	    str << "; ";
 
 	    Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
-	    str << "box "
-		<< setprecision(10) << setunit('d') << vv << ' ' 
-		<< setprecision(3) << setunit('"') << fixed << rr << ' ';
-	    str.unsetf(ios_base::floatfield);
-	    str << setprecision(8) << radToDeg(angle);
+	    str << "box " << setunit('d') << vv << ' ' 
+		<< setunit('"') << rr << ' ' << radToDeg(angle);
 
 	    if (ii!=0) {
 	      Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC);
-	      str << " & !box "
-		  << setprecision(8) << setunit('d') << vv << ' ' 
-		  << setprecision(3) << setunit('"') << fixed << r1 << ' ';
-	      str.unsetf(ios_base::floatfield);
-	      str << setprecision(8) << radToDeg(angle);
+	      str << " & !box " << setunit('d') << vv << ' ' 
+		  << setunit('"') << r1 << ' ' << radToDeg(angle);
 	    }
 
 	    listProsPost(str, strip);
@@ -419,17 +411,13 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys,
 	  str << "; ";
 
 	  Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
-	  str << "box " << ra << ' ' << dec << ' ' 
-	      << setprecision(3) << setunit('"') << fixed << rr << ' ';
-	  str.unsetf(ios_base::floatfield);
-	  str << setprecision(8) << radToDeg(angle);
+	  str << "box " << ra << ' ' << dec << ' ' << setunit('"') << rr << ' '
+	      << radToDeg(angle);
 
 	  if (ii!=0) {
 	    Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC);
 	    str << " & !box " << ra << ' ' << dec << ' ' 
-		<< setprecision(3) << setunit('"') << fixed << r1 << ' ';
-	    str.unsetf(ios_base::floatfield);
-	    str << setprecision(8) << radToDeg(angle);
+		<< setunit('"') << r1 << ' ' << radToDeg(angle);
 	  }
 
 	  listProsPost(str, strip);
@@ -447,12 +435,11 @@ void BoxAnnulus::listSAOimage(ostream& str, int strip)
 
   for (int ii=0; ii<numAnnuli_; ii++) {
     Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-    str << "box(" << setprecision(8) << vv << ','
-	<< annuli_[ii] << ',' << radToDeg(angle) << ')';
+    str << "box(" << vv << ',' << annuli_[ii] << ',' << radToDeg(angle) << ')';
 
     if (ii!=0)
-      str << " & !box(" << setprecision(8) << vv << ','
-	  << annuli_[ii-1] << ',' << radToDeg(angle) << ')';
+      str << " & !box(" << vv << ',' << annuli_[ii-1] << ',' 
+	  << radToDeg(angle) << ')';
 
     listSAOimagePost(str, strip);
   }
diff --git a/tksao/frame/bpanda.C b/tksao/frame/bpanda.C
index 479a215..ebde5be 100644
--- a/tksao/frame/bpanda.C
+++ b/tksao/frame/bpanda.C
@@ -545,21 +545,25 @@ void Bpanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << type_ << '(' << setprecision(8) << vv << ','
-	      << ang1 << ',' << ang2 <<',' << numAngles_-1 << ','
-	      << setunit('"') << r1 << ',' << setunit('"') << r2 << ','
-	      << numAnnuli_-1 << ','
-	      << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')';
+	  str << type_ << '(' 
+	      << setprecision(10) << vv << ','
+	      << setprecision(8) << ang1 << ',' << ang2 << ',' 
+	      << setprecision(8) << numAngles_-1 << ','
+	      << setprecision(3) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ',';
+	  str.unsetf(ios_base::floatfield);
+	  str << setprecision(8) << numAnnuli_-1 << ','
+	      << setprecision(8) << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')';
 	}
 	break;
       case Coord::SEXAGESIMAL:
 	listRADEC(ptr,center,sys,sky,format);
 	str << type_ << '(' << ra << ',' << dec << ','
-	    << setprecision(8) 
-	    << ang1 << ',' << ang2 <<',' << numAngles_-1 << ','
-	    << setunit('"') << r1 << ',' << setunit('"') << r2 << ','
-	    << numAnnuli_-1 << ','
-	    << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')';
+	      << setprecision(8) << ang1 << ',' << ang2 << ',' 
+	      << setprecision(8) << numAngles_-1 << ','
+	      << setprecision(3) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ',';
+	  str.unsetf(ios_base::floatfield);
+	  str << setprecision(8) << numAnnuli_-1 << ','
+	      << setprecision(8) << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')';
 	break;
       }
     }
@@ -705,9 +709,8 @@ void Bpanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str,
   Vector r2 =  ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);	
   double aa = parent->mapAngleFromRef(angle,sys,sky);
       
-  str << setprecision(10) << a1 << ',' << a2 << ",1,"
-      << setprecision(3) << fixed << setunit('"') << r1 << ',' 
-      << setunit('"') << r2 << ",1,";
+  str << setprecision(8) << a1 << ',' << a2 << ",1,"
+      << setprecision(3) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ",1,";
   str.unsetf(ios_base::floatfield);
   str << setprecision(8) << radToDeg(aa) << ')';
 		
diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C
index 42d75c4..20c6d6f 100644
--- a/tksao/frame/circle.C
+++ b/tksao/frame/circle.C
@@ -243,8 +243,7 @@ void Circle::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	break;
       case Coord::SEXAGESIMAL:
 	listRADEC(ptr,center,sys,sky,format);
-	str << type_ << '(' 
-	    << ra << ',' << dec << ',' 
+	str << type_ << '(' << ra << ',' << dec << ',' 
 	    << setprecision(3) << fixed << rr << '"' << ')';
 	str.unsetf(ios_base::floatfield);
 	break;
@@ -321,8 +320,7 @@ void Circle::listCiao(ostream& str, Coord::CoordSystem sys, int strip)
     if (ptr->hasWCSCel(sys)) {
       listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL);
       double rr = ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCMIN);
-      str << type_ << '(' 
-	  << ra << ',' << dec << ',' 
+      str << type_ << '(' << ra << ',' << dec << ',' 
 	  << setprecision(5) << fixed << rr << '\'' << ')';
       str.unsetf(ios_base::floatfield);
     }
diff --git a/tksao/frame/composite.C b/tksao/frame/composite.C
index b5e5a6c..855f152 100644
--- a/tksao/frame/composite.C
+++ b/tksao/frame/composite.C
@@ -200,7 +200,7 @@ void Composite::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
     case Coord::AMPLIFIER:
       {
 	Vector vv = ptr->mapFromRef(center,sys);
-	str << type_ << '(' << setprecision(8) << vv<< ',' 
+	str << type_ << '(' << setprecision(8) << vv << ',' 
 	    << radToDeg(parent->mapAngleFromRef(angle,sys)) << ')';
       }
       break;
@@ -210,13 +210,15 @@ void Composite::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	case Coord::DEGREES:
 	  {
 	    Vector vv = ptr->mapFromRef(center,sys,sky);
-	    str << type_ << '(' << setprecision(8) << vv << ','
+	    str << type_ << '(' << setprecision(10) << vv << ','
+		<< setprecision(8) 
 		<< radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')';
 	  }
 	  break;
 	case Coord::SEXAGESIMAL:
 	  listRADEC(ptr,center,sys,sky,format);
 	  str << type_ << '(' << ra << ',' << dec << ',' 
+	      << setprecision(8) 
 	      << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')';
 	  break;
 	}
diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C
index 2ba2fdb..af96548 100644
--- a/tksao/frame/cpanda.C
+++ b/tksao/frame/cpanda.C
@@ -517,8 +517,7 @@ void Cpanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	  str << type_ << '(' 
 	      << setprecision(10) << vv << ','
 	      << setprecision(8) << a1 << ',' << a2 <<',' << numAngles_-1 << ','
-	      << setprecision(3) << fixed << r1 << '"' << ','	
-	      << r2 << '"' << ',';
+	      << setprecision(3) << fixed << r1 << '"' << ',' << r2 << '"' << ',';
 	  str.unsetf(ios_base::floatfield);
 	  str << setprecision(8) << numAnnuli_-1 << ')';
 	}
@@ -528,8 +527,7 @@ void Cpanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	str << type_ << '(' 
 	    << ra << ',' << dec << ','
 	    << setprecision(8) << a1 << ',' << a2 <<',' << numAngles_-1 << ','
-	    << setprecision(3) << fixed << r1 << '"' << ','	
-	    << r2 << '"' << ',';
+	    << setprecision(3) << fixed << r1 << '"' << ',' << r2 << '"' << ',';
 	str.unsetf(ios_base::floatfield);
 	str << setprecision(8) << numAnnuli_-1 << ')';
 	break;
@@ -618,8 +616,7 @@ void Cpanda::listBNonCel(FitsImage* ptr, ostream& str,
 
       double r1 = ptr->mapLenFromRef(annuli_[ii-1][0],sys);
       double r2 = ptr->mapLenFromRef(annuli_[ii][0],sys);
-      str << type_ << '(' 
-	  << setprecision(8) << vv << ','
+      str << type_ << '(' << setprecision(8) << vv << ','
 	  << a1 << ',' << a2 << ",1,"
 	  << r1 << ',' << r2 << ",1)";
 
@@ -668,7 +665,7 @@ void Cpanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str,
   double r1 = ptr->mapLenFromRef(annuli_[ii-1][0],sys,Coord::ARCSEC);
   double r2 = ptr->mapLenFromRef(annuli_[ii][0],sys,Coord::ARCSEC);
 
-  str << setprecision(10) << a1 << ',' << a2 << ",1,"
+  str << setprecision(8) << a1 << ',' << a2 << ",1,"
       << setprecision(3) << fixed << r1 << '"' << ',' << r2 << '"' << ",1)";
   str.unsetf(ios_base::floatfield);
 		
diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C
index 2ac7f8d..f423427 100644
--- a/tksao/frame/ellipse.C
+++ b/tksao/frame/ellipse.C
@@ -266,8 +266,7 @@ void Ellipse::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	break;
       case Coord::SEXAGESIMAL:
 	listRADEC(ptr,center,sys,sky,format);
-	str << type_ << '(' << setprecision(8)
-	    << ra << ',' << dec << ',' 
+	str << type_ << '(' << ra << ',' << dec << ',' 
 	    << setprecision(3) << fixed << setunit('"') << rr << ',';
 	str.unsetf(ios_base::floatfield);
 	str << setprecision(8) << radToDeg(aa) << ')';
@@ -349,8 +348,7 @@ void Ellipse::listCiao(ostream& str, Coord::CoordSystem sys, int strip)
     if (ptr->hasWCSCel(sys)) {
       listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL);
       Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCMIN);
-      str << type_ << '('
-	  << ra << ',' << dec << ',' 
+      str << type_ << '(' << ra << ',' << dec << ',' 
 	  << setprecision(5) << fixed << setunit('\'') << rr << ',';
       str.unsetf(ios_base::floatfield);
       str << setprecision(8) << radToDeg(angle) << ')';
diff --git a/tksao/frame/ellipseannulus.C b/tksao/frame/ellipseannulus.C
index a741016..11fcd6e 100644
--- a/tksao/frame/ellipseannulus.C
+++ b/tksao/frame/ellipseannulus.C
@@ -259,7 +259,7 @@ void EllipseAnnulus::list(ostream& str, Coord::CoordSystem sys,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << "ellipse(" << setprecision(8) << vv
+	  str << "ellipse(" << setprecision(10) << vv
 	      << setprecision(3) << fixed;
 	  for (int ii=0; ii<numAnnuli_; ii++) {
 	    Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
@@ -337,13 +337,11 @@ void EllipseAnnulus::listPros(ostream& str, Coord::CoordSystem sys,
 	str << "; ";
 
 	Vector rr = ptr->mapLenFromRef(annuli_[ii],Coord::IMAGE);
-	str << "ellipse " << setprecision(8) << vv << ' ' << rr << ' ' 
-	    << radToDeg(angle);
+	str << "ellipse " << vv << ' ' << rr << ' ' << radToDeg(angle);
 
 	if (ii!=0) {
 	  Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],Coord::IMAGE);
-	  str << " & !ellipse " << setprecision(8) << vv << ' ' << r1 << ' ' 
-	      << radToDeg(angle);
+	  str << " & !ellipse " << vv << ' ' << r1 << ' ' << radToDeg(angle);
 	}
 
 	listProsPost(str, strip);
@@ -361,19 +359,13 @@ void EllipseAnnulus::listPros(ostream& str, Coord::CoordSystem sys,
 	    str << "; ";
 
 	    Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
-	    str << "ellipse " 
-		<< setprecision(10) << setunit('d') << vv << ' ' 
-		<< setprecision(3) << setunit('"') << fixed << rr << ' ';
-	  str.unsetf(ios_base::floatfield);
-	  str << setprecision(8) << radToDeg(angle);
+	    str << "ellipse " << setunit('d') << vv << ' ' 
+		<< setunit('"') << rr << ' ' << radToDeg(angle);
 
 	    if (ii!=0) {
 	      Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC);
-	      str << " & !ellipse " 
-		  << setprecision(8) << setunit('d') << vv << ' ' 
-		  << setprecision(3) << setunit('"') << fixed << r1 << ' ';
-	      str.unsetf(ios_base::floatfield);
-	      str << setprecision(8) << radToDeg(angle);
+	      str << " & !ellipse " << setunit('d') << vv << ' ' 
+		  << setunit('"') << r1 << ' ' << radToDeg(angle);
 	    }
 
 	    listProsPost(str, strip);
@@ -388,16 +380,12 @@ void EllipseAnnulus::listPros(ostream& str, Coord::CoordSystem sys,
 
 	  Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
 	  str << "ellipse " << ra << ' ' << dec << ' ' 
-	      << setprecision(3) << setunit('"') << fixed << rr << ' ';
-	  str.unsetf(ios_base::floatfield);
-	  str << setprecision(8) << radToDeg(angle);
+	      << setunit('"') << rr << ' ' << radToDeg(angle);
 
 	  if (ii!=0) {
 	    Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC);
 	    str << " & !ellipse " << ra << ' ' << dec << ' ' 
-		<< setprecision(3) << setunit('"') << fixed << r1 << ' ';
-	    str.unsetf(ios_base::floatfield);
-	    str << setprecision(8) << radToDeg(angle);
+		<< setunit('"') << r1 << ' ' << radToDeg(angle);
 	  }
 
 	  listProsPost(str, strip);
@@ -415,12 +403,12 @@ void EllipseAnnulus::listSAOimage(ostream& str, int strip)
 
   for (int ii=0; ii<numAnnuli_; ii++) {
     Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-    str << "ellipse(" << setprecision(8) << vv << ','
-	<< annuli_[ii] << ',' << radToDeg(angle) << ')';
+    str << "ellipse(" << vv << ',' << annuli_[ii] << ',' 
+	<< radToDeg(angle) << ')';
 
     if (ii!=0)
-      str << " & !ellipse(" << setprecision(8) << vv << ','
-	  << annuli_[ii-1] << ',' << radToDeg(angle) << ')';
+      str << " & !ellipse(" << vv << ',' << annuli_[ii-1] << ',' 
+	  << radToDeg(angle) << ')';
 
     listSAOimagePost(str, strip);
   }
diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C
index 5ec98d5..8f2a65a 100644
--- a/tksao/frame/epanda.C
+++ b/tksao/frame/epanda.C
@@ -675,9 +675,8 @@ void Epanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str,
   Vector r2 =  ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);	
   double aa = parent->mapAngleFromRef(angle,sys,sky);
       
-  str << setprecision(10) << a1 << ',' << a2 << ",1,"
-      << setprecision(3) << fixed << setunit('"') << r1 << ',' 
-      << setunit('"') << r2 << ",1,";
+  str << setprecision(8) << a1 << ',' << a2 << ",1,"
+      << setprecision(3) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ",1,";
   str.unsetf(ios_base::floatfield);
   str << setprecision(8) << radToDeg(aa) << ')';
 		
diff --git a/tksao/frame/point.C b/tksao/frame/point.C
index 76a53b4..cd55e6f 100644
--- a/tksao/frame/point.C
+++ b/tksao/frame/point.C
@@ -764,7 +764,8 @@ void Point::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << type_ << '(' << setprecision(10) << vv << ')';
+	  str << type_ << '(' 
+	      << setprecision(10) << vv << ')';
 	}
 	break;
       case Coord::SEXAGESIMAL:
@@ -865,7 +866,7 @@ void Point::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       coord.listProsCoordSystem(str,sys,sky);
       str << "; ";
       Vector vv = ptr->mapFromRef(center,sys);
-      str << type_ << ' ' << setprecision(8) << vv;
+      str << type_ << ' ' << vv;
     }
     break;
   default:
@@ -877,7 +878,7 @@ void Point::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << type_ << ' ' << setprecision(10) << setunit('d') << vv;
+	  str << type_ << ' ' << setunit('d') << vv;
 	}
 	break;
       case Coord::SEXAGESIMAL:
@@ -905,7 +906,7 @@ void Point::listSAOtng(ostream& str, Coord::CoordSystem sys,
   case Coord::AMPLIFIER:
     {
       Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-      str << type_ << '(' << setprecision(8) << vv << ')';
+      str << type_ << '(' << vv << ')';
     }
     break;
   default:
@@ -914,7 +915,7 @@ void Point::listSAOtng(ostream& str, Coord::CoordSystem sys,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << type_ << '(' << setprecision(10) << vv << ')';
+	  str << type_ << '(' << vv << ')';
 	}
 	break;
       case Coord::SEXAGESIMAL:
@@ -936,7 +937,7 @@ void Point::listSAOimage(ostream& str, int strip)
   // all coords are in image coords
 
   Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-  str << type_ << '(' << setprecision(8) << vv << ')';
+  str << type_ << '(' << vv << ')';
 
   listSAOimagePost(str, strip);
 }
diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C
index 186266f..efcd3d4 100644
--- a/tksao/frame/projection.C
+++ b/tksao/frame/projection.C
@@ -357,7 +357,8 @@ void Projection::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	  {
 	    Vector v1 = ptr->mapFromRef(p1,sys,sky);
 	    Vector v2 = ptr->mapFromRef(p2,sys,sky);
-	    str << type_ << '(' << setprecision(10) << v1 << ',' << v2 << ','
+	    str << type_ << '(' 
+		<< setprecision(10) << v1 << ',' << v2 << ','
 		<< setprecision(3) << fixed << ww << '"' << ')';
 	    str.unsetf(ios_base::floatfield);
 	  }
@@ -368,7 +369,6 @@ void Projection::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	  str << ra << ',' << dec << ',';
 	  listRADEC(ptr,p2,sys,sky,format);
 	  str << ra << ',' << dec << ',';
-
 	  str << setprecision(3) << fixed << ww << '"' << ')';
 	  str.unsetf(ios_base::floatfield);
 	  break;
diff --git a/tksao/frame/text.C b/tksao/frame/text.C
index 2873043..8bf47cc 100644
--- a/tksao/frame/text.C
+++ b/tksao/frame/text.C
@@ -295,7 +295,7 @@ void Text::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
   case Coord::AMPLIFIER:
     {
       Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-      str << type_ << '(' << setprecision(8) << vv << ", \"" << text << "\")";
+      str << type_ << '(' << vv << ", \"" << text << "\")";
     }
     break;
   default:
@@ -304,8 +304,7 @@ void Text::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       case Coord::DEGREES:
 	{
 	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << type_ << '(' << setprecision(10) << vv 
-	      << ", \"" << text << "\")";
+	  str << type_ << '(' << vv  << ", \"" << text << "\")";
 	}
 	break;
       case Coord::SEXAGESIMAL:
diff --git a/tksao/frame/vect.C b/tksao/frame/vect.C
index e9e9dff..f3bc337 100644
--- a/tksao/frame/vect.C
+++ b/tksao/frame/vect.C
@@ -74,7 +74,8 @@ void Vect::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	case Coord::DEGREES:
 	  {
 	    Vector v1 = ptr->mapFromRef(p1,sys,sky);
-	    str << type_ << '(' << setprecision(10) << v1 << ','
+	    str << type_ << '(' 
+		<< setprecision(10) << v1 << ','
 		<< setprecision(3) << fixed << rr << '"' << ',';
 	    str.unsetf(ios_base::floatfield);
 	    str << setprecision(8) << radToDeg(aa) << ')';