diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-01-11 17:10:53 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-01-11 17:10:53 (GMT) |
| commit | 3a67bac4dbcf25fca514a947497ccdd86d5f9a8c (patch) | |
| tree | 821e67559bd05f4ca725f9bfbfb4ffa2865692bd /tksao | |
| parent | a6748f741f11b5f3fac5058c884beb5cf6adf495 (diff) | |
| download | blt-3a67bac4dbcf25fca514a947497ccdd86d5f9a8c.zip blt-3a67bac4dbcf25fca514a947497ccdd86d5f9a8c.tar.gz blt-3a67bac4dbcf25fca514a947497ccdd86d5f9a8c.tar.bz2 | |
clean up marker code
Diffstat (limited to 'tksao')
| -rw-r--r-- | tksao/frame/boxannulus.C | 70 |
1 files changed, 30 insertions, 40 deletions
diff --git a/tksao/frame/boxannulus.C b/tksao/frame/boxannulus.C index dfaec84..2534369 100644 --- a/tksao/frame/boxannulus.C +++ b/tksao/frame/boxannulus.C @@ -367,51 +367,41 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys, default: if (ptr->hasWCSCel(sys)) { listRADECPros(ptr,center,sys,sky,format); - switch (format) { - case Coord::DEGREES: - for (int ii=0; ii<numAnnuli_; ii++) { - coord.listProsCoordSystem(str,sys,sky); - str << "; "; - - Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC); - str << "box " << ra << 'd' << ' ' << dec << 'd' << ' ' - << setprecision(3) << setunit('"') << fixed << rr << ' '; - str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(angle); - if (ii!=0) { - Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC); - str << " & !box " << ra << 'd' << ' ' << dec << 'd' << ' ' - << setprecision(3) << setunit('"') << fixed << r1 << ' '; - str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(angle); - } + for (int ii=0; ii<numAnnuli_; ii++) { + coord.listProsCoordSystem(str,sys,sky); + str << "; "; - listProsPost(str, strip); + Vector rr = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC); + str << "box "; + switch (format) { + case Coord::DEGREES: + str << ra << 'd' << ' ' << dec << 'd' << ' '; + break; + case Coord::SEXAGESIMAL: + str << ra << ' ' << dec << ' '; + break; } - break; - case Coord::SEXAGESIMAL: - for (int ii=0; ii<numAnnuli_; ii++) { - coord.listProsCoordSystem(str,sys,sky); - 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); - - 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); - } + str << setprecision(3) << setunit('"') << fixed << rr << ' '; + str.unsetf(ios_base::floatfield); + str << setprecision(8) << radToDeg(angle); - listProsPost(str, strip); + if (ii!=0) { + Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC); + str << " & !box "; + switch (format) { + case Coord::DEGREES: + str << ra << 'd' << ' ' << dec << 'd' << ' '; + break; + case Coord::SEXAGESIMAL: + str << ra << ' ' << dec << ' '; + break; + } + str << setprecision(3) << setunit('"') << fixed << r1 << ' '; + str.unsetf(ios_base::floatfield); + str << setprecision(8) << radToDeg(angle); } - break; + listProsPost(str, strip); } } } |