diff options
Diffstat (limited to 'tksao/frame/box.C')
-rw-r--r-- | tksao/frame/box.C | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/tksao/frame/box.C b/tksao/frame/box.C index 3cb081b..59a19f7 100644 --- a/tksao/frame/box.C +++ b/tksao/frame/box.C @@ -272,9 +272,10 @@ void Box::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCSEC); double aa = parent->mapAngleFromRef(angle,sys,sky); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(3) << fixed << setunit('"') << rr << ','; + << setprecision(parent->precArcsec) << fixed << setunit('"') + << rr << ','; str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear) << radToDeg(aa) << ')'; } else listNonCel(ptr, str, sys); @@ -308,7 +309,8 @@ void Box::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector vv = ptr->mapFromRef(center,sys); Vector rr = ptr->mapLenFromRef(annuli_[0],sys); double aa = parent->mapAngleFromRef(angle,sys); - str << type_ << '(' << setprecision(8) << vv << ',' << rr << ',' + str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + << rr << ',' << radToDeg(aa) << ')'; } @@ -344,7 +346,8 @@ void Box::listCiao(ostream& str, Coord::CoordSystem sys, int strip) { Vector vv = ptr->mapFromRef(center,Coord::PHYSICAL); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::PHYSICAL); - str << type_ << '(' << setprecision(8) << vv << ',' << rr << ',' + str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + << rr << ',' << radToDeg(angle) << ')'; } break; @@ -353,9 +356,10 @@ void Box::listCiao(ostream& str, Coord::CoordSystem sys, int strip) listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL); Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCMIN); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(5) << fixed << setunit('\'') << rr << ','; + << setprecision(parent->precArcmin) << fixed << setunit('\'') + << rr << ','; str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(angle) << ')'; + str << setprecision(parent->precLinear) << radToDeg(angle) << ')'; } } @@ -377,7 +381,8 @@ void Box::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); - str << type_ << '(' << setprecision(8) << vv << ',' << rr << ',' + str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + << rr << ',' << radToDeg(angle) << ')'; } break; @@ -386,8 +391,8 @@ void Box::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(8) << rr << ',' - << setprecision(8) << radToDeg(angle) << ')'; + << setprecision(parent->precLinear) << rr << ',' + << setprecision(parent->precLinear) << radToDeg(angle) << ')'; } } @@ -409,8 +414,9 @@ void Box::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, 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_ << ' ' << setprecision(parent->precLinear) + << vv << ' ' << rr << ' ' + << radToDeg(angle); } break; default: @@ -427,9 +433,10 @@ void Box::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, str << ra << ' ' << dec << ' '; break; } - str << setprecision(3) << fixed << setunit('"') << rr << ' '; + str << setprecision(parent->precArcsec) << fixed << setunit('"') + << rr << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(8) << radToDeg(angle); + str << setprecision(parent->precLinear) << radToDeg(angle); } } @@ -442,7 +449,8 @@ void Box::listSAOimage(ostream& str, int strip) listSAOimagePre(str); Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(8) << vv << ',' << annuli_[0] << ',' + str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + << annuli_[0] << ',' << radToDeg(angle) << ')'; listSAOimagePost(str, strip); |