clean up marker code

4 files changed, 28 insertions, 84 deletions

diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C
index 3629a32..7bddfd9 100644
--- a/tksao/frame/cpanda.C
+++ b/tksao/frame/cpanda.C
@@ -503,14 +503,10 @@ void Cpanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
     break;
   default:
     if (ptr->hasWCSCel(sys)) {
-      double a1 =
-	radToDeg(parent->mapAngleFromRef(angles_[0],sys,sky));
-      double a2 =
-	radToDeg(parent->mapAngleFromRef(angles_[numAngles_-1],sys,sky));
-      double r1 =
-	ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCSEC);
-      double r2 =
-	ptr->mapLenFromRef(annuli_[numAnnuli_-1][0],sys,Coord::ARCSEC);
+      double a1 = radToDeg(parent->mapAngleFromRef(angles_[0],sys,sky));
+      double a2 = radToDeg(parent->mapAngleFromRef(angles_[numAngles_-1],sys,sky));
+      double r1 = ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCSEC);
+      double r2 = ptr->mapLenFromRef(annuli_[numAnnuli_-1][0],sys,Coord::ARCSEC);
       if (a2<=a1+FLT_EPSILON)
 	a2 += 360;
 
diff --git a/tksao/frame/ellipseannulus.C b/tksao/frame/ellipseannulus.C
index b18fd32..ce9bda5 100644
--- a/tksao/frame/ellipseannulus.C
+++ b/tksao/frame/ellipseannulus.C
@@ -254,33 +254,16 @@ void EllipseAnnulus::list(ostream& str, Coord::CoordSystem sys,
     break;
   default:
     if (ptr->hasWCSCel(sys)) {
+      listRADEC(ptr,center,sys,sky,format);
       double aa = parent->mapAngleFromRef(angle,sys,sky);
-      switch (format) {
-      case Coord::DEGREES:
-	{
-	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << "ellipse(" << setprecision(10) << vv
-	      << setprecision(3) << fixed;
-	  for (int ii=0; ii<numAnnuli_; ii++) {
-	    Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
-	    str << ',' << setunit('"') << rr;
-	  }
-	  str.unsetf(ios_base::floatfield);
-	  str << setprecision(8) << ',' << radToDeg(aa) << ')';
-	}
-	break;
-      case Coord::SEXAGESIMAL:
-	listRADEC(ptr,center,sys,sky,format);
-	str << "ellipse(" << ra << ',' << dec
-	    << setprecision(3) << fixed;
-	for (int ii=0; ii<numAnnuli_; ii++) {
-	  Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
-	  str << ',' << setunit('"') << rr;
-	}
-	str.unsetf(ios_base::floatfield);
-	str << setprecision(8) << ',' << radToDeg(aa) << ')';
-	break;
+      str << "ellipse(" << ra << ',' << dec
+	  << setprecision(3) << fixed;
+      for (int ii=0; ii<numAnnuli_; ii++) {
+	Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC);
+	str << ',' << setunit('"') << rr;
       }
+      str.unsetf(ios_base::floatfield);
+      str << setprecision(8) << ',' << radToDeg(aa) << ')';
     }
     else
       listNonCel(ptr, str, sys);
diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C
index 1311fd5..399aaf1 100644
--- a/tksao/frame/epanda.C
+++ b/tksao/frame/epanda.C
@@ -506,32 +506,15 @@ void Epanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
       if (a2<=a1+FLT_EPSILON)
 	a2 += 360;
 
-      switch (format) {
-      case Coord::DEGREES:
-	{
-	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  str << type_ << '(' 
-	      << setprecision(10) << vv << ','
-	      << setprecision(8) << a1 << ',' << a2 <<',' << numAngles_-1 << ','
-	      << setprecision(3) << fixed << setunit('"') << r1 << ',' 
-	      << setunit('"') << r2 << ',';
-	  str.unsetf(ios_base::floatfield);
-	  str << setprecision(8) << numAnnuli_-1 << ','
-	      << setprecision(8) << radToDeg(aa) << ')';
-	}
-	break;
-      case Coord::SEXAGESIMAL:
-	listRADEC(ptr,center,sys,sky,format);
-	str << type_ << '(' 
-	    << ra << ',' << dec << ','
-	    << setprecision(8) << a1 << ',' << a2 <<',' << numAngles_-1 << ','
-	    << setprecision(3) << fixed << setunit('"') << r1 << ',' 
-	    << setunit('"') << r2 << ',';
-	str.unsetf(ios_base::floatfield);
-	str << setprecision(8) << numAnnuli_-1 << ','
-	    << setprecision(8) << radToDeg(aa) << ')';
-	break;
-      }
+      listRADEC(ptr,center,sys,sky,format);
+      str << type_ << '(' 
+	  << ra << ',' << dec << ','
+	  << setprecision(8) << a1 << ',' << a2 <<',' << numAngles_-1 << ','
+	  << setprecision(3) << fixed << setunit('"') << r1 << ',' 
+	  << setunit('"') << r2 << ',';
+      str.unsetf(ios_base::floatfield);
+      str << setprecision(8) << numAnnuli_-1 << ','
+	  << setprecision(8) << radToDeg(aa) << ')';
     }
     else
       listANonCel(ptr, str, sys);
@@ -571,31 +554,14 @@ void Epanda::listB(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
     break;
   default:
     if (ptr->hasWCSCel(sys)) {
-      switch (format) {
-      case Coord::DEGREES:
-	{
-	  Vector vv = ptr->mapFromRef(center,sys,sky);
-	  for (int jj=1; jj<numAngles_; jj++) {
-	    for (int ii=1; ii<numAnnuli_; ii++) {
-	      listPre(str, sys, sky, ptr, strip, 0);
-	      str << type_ << '(' << setprecision(10) << vv << ',';
-	      listBCel(ptr, ii, jj, str, sys, sky, format, conj, strip);
-	    }
-	  }
+      listRADEC(ptr,center,sys,sky,format);
+      for (int jj=1; jj<numAngles_; jj++) {
+	for (int ii=1; ii<numAnnuli_; ii++) {
+	  listPre(str, sys, sky, ptr, strip, 0);
+	  str << type_ << '(' << ra << ',' << dec << ',';
+	  listBCel(ptr, ii, jj, str, sys, sky, format, conj, strip);
 	}
-	break;
-      case Coord::SEXAGESIMAL:
-	listRADEC(ptr,center,sys,sky,format);
-	for (int jj=1; jj<numAngles_; jj++) {
-	  for (int ii=1; ii<numAnnuli_; ii++) {
-	    listPre(str, sys, sky, ptr, strip, 0);
-	    str << type_ << '(' << ra << ',' << dec << ',';
-	    listBCel(ptr, ii, jj, str, sys, sky, format, conj, strip);
-	  }
-	}
-	break;
       }
-      break;
     }
     else
       listBNonCel(ptr, str, sys, sky, format, conj, strip);
diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C
index 9c8816f..7fbf47c 100644
--- a/tksao/frame/marker.C
+++ b/tksao/frame/marker.C
@@ -1631,9 +1631,8 @@ void Marker::listXY(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 	listRADEC(ptr,center,sys,sky,format);
 	str << ra << ' ' << dec;
       }
-      else {
+      else
 	str << setprecision(8) << ptr->mapFromRef(center,sys);
-      }
     }
     break;
   }