diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-03-21 16:29:17 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-03-21 16:29:17 (GMT) |
| commit | 078329136ce02fc6578728f08906ed88738a92f1 (patch) | |
| tree | 6ec6a6ec967fd773bced5f61eceb8d1056067251 /tksao/frame/ellipse.C | |
| parent | 28b383c0d366adf7174caa656554ef09b9775ac1 (diff) | |
| download | blt-078329136ce02fc6578728f08906ed88738a92f1.zip blt-078329136ce02fc6578728f08906ed88738a92f1.tar.gz blt-078329136ce02fc6578728f08906ed88738a92f1.tar.bz2 | |
clean up region list code
Diffstat (limited to 'tksao/frame/ellipse.C')
| -rw-r--r-- | tksao/frame/ellipse.C | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C index 34069a4..2ac7f8d 100644 --- a/tksao/frame/ellipse.C +++ b/tksao/frame/ellipse.C @@ -378,8 +378,7 @@ void Ellipse::listSAOtng(ostream& str, Coord::CoordSystem sys, { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); - str << type_ << '(' << setprecision(8) << vv << ',' << rr << ',' - << radToDeg(angle) << ')'; + str << type_ << '(' << vv << ',' << rr << ',' << radToDeg(angle) << ')'; } break; default: @@ -389,18 +388,14 @@ void Ellipse::listSAOtng(ostream& str, Coord::CoordSystem sys, case Coord::DEGREES: { Vector vv = ptr->mapFromRef(center,sys,sky); - str << type_ << '(' - << setprecision(10) << vv << ',' - << setprecision(8) << rr << ',' - << setprecision(8) << radToDeg(angle) << ')'; + str << type_ << '(' << vv << ',' << rr << ',' + << radToDeg(angle) << ')'; } break; case Coord::SEXAGESIMAL: listRADEC(ptr,center,sys,sky,format); - str << type_ << '(' - << ra << ',' << dec << ',' - << setprecision(8) << rr << ',' - << setprecision(8) << radToDeg(angle) << ')'; + str << type_ << '(' << ra << ',' << dec << ',' << rr << ',' + << radToDeg(angle) << ')'; break; } } @@ -425,8 +420,7 @@ void Ellipse::listPros(ostream& str, Coord::CoordSystem sys, Vector vv = ptr->mapFromRef(center,sys); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' << setprecision(8) << vv << ' ' << rr << ' ' - << radToDeg(angle); + str << "; " << type_ << ' ' << vv << ' ' << rr << ' ' << radToDeg(angle); } break; default: @@ -437,21 +431,15 @@ void Ellipse::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 << setunit('"') << rr << ' '; - str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(angle); + str << "; " << type_ << ' ' << setunit('d') << vv << ' ' + << setunit('"') << rr << ' ' << radToDeg(angle); } break; case Coord::SEXAGESIMAL: listRADECPros(ptr,center,sys,sky,format); coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' - << ra << ' ' << dec << ' ' - << setprecision(3) << fixed << setunit('"') << rr << ' '; - str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(angle); + str << "; " << type_ << ' ' << ra << ' ' << dec << ' ' + << setunit('"') << rr << ' ' << radToDeg(angle); break; } } @@ -466,7 +454,7 @@ void Ellipse::listSAOimage(ostream& str, int strip) listSAOimagePre(str); Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(8) << vv << ',' << annuli_[0] << ',' + str << type_ << '(' << vv << ',' << annuli_[0] << ',' << radToDeg(angle) << ')'; listSAOimagePost(str, strip); |