diff options
Diffstat (limited to 'tksao/frame/frblt.C')
| -rw-r--r-- | tksao/frame/frblt.C | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tksao/frame/frblt.C b/tksao/frame/frblt.C index acfe79f..f9aa4fc 100644 --- a/tksao/frame/frblt.C +++ b/tksao/frame/frblt.C @@ -376,7 +376,8 @@ int Base::markerAnalysisRadial(Marker* pp, double** x, double** y, double** e, Vector cdelt= ptr->getWCScdelt(sys); double ll = fabs(cdelt[0]); #else - double ll = ptr->getWCSPixelSize(sys); + Vector rr = ptr->getWCSSize(sys); + double ll = (rr[0]+rr[1])/2.; #endif if (ptr->hasWCSCel(sys)) { @@ -393,7 +394,8 @@ int Base::markerAnalysisRadial(Marker* pp, double** x, double** y, double** e, Vector cdelt= ptr->getWCScdelt(sys); double aa = fabs(cdelt[0]*cdelt[1]); #else - double aa = ptr->getWCSPixelArea(sys); + Vector rr = ptr->getWCSSize(sys); + double aa = rr.area(); #endif for (int kk=0; kk<num; kk++) { @@ -499,7 +501,8 @@ int Base::markerAnalysisPanda(Marker* pp, double** x, double** y, double** e, Vector cdelt= ptr->getWCScdelt(sys); double ll = fabs(cdelt[0]); #else - double ll = ptr->getWCSPixelSize(sys); + Vector rr = ptr->getWCSSize(sys); + double ll = (rr[0]+rr[1])/2.; #endif if (ptr->hasWCSCel(sys)) { @@ -516,7 +519,8 @@ int Base::markerAnalysisPanda(Marker* pp, double** x, double** y, double** e, Vector cdelt= ptr->getWCScdelt(sys); double aa = fabs(cdelt[0]*cdelt[1]); #else - double aa= ptr->getWCSPixelArea(sys); + Vector rr = ptr->getWCSSize(sys); + double aa = rr.area(); #endif for (int qq=0; qq<aa; qq++) { @@ -836,7 +840,8 @@ int Base::markerAnalysisStats1(Marker* pp,FitsImage* ptr, ostream& str, Vector cdelt= ptr->getWCScdelt(sys); double ll = fabs(cdelt[0]); #else - double ll = ptr->getWCSPixelSize(sys); + Vector rr = ptr->getWCSSize(sys); + double ll = (rr[0]+rr[1])/2.; #endif if (ptr->hasWCSCel(sys)) { str << "1 pixel = "<< ll*60*60 << " arcsec"; @@ -882,7 +887,8 @@ void Base::markerAnalysisStats2(FitsImage* ptr, ostream& str, Vector cdelt= ptr->getWCScdelt(sys); double aa = fabs(cdelt[0]*cdelt[1]); #else - double aa = ptr->getWCSPixelArea(sys); + Vector rr = ptr->getWCSSize(sys); + double aa = rr.area(); #endif area = aa*60*60*60*60*cnt; } @@ -894,7 +900,8 @@ void Base::markerAnalysisStats2(FitsImage* ptr, ostream& str, Vector cdelt= ptr->getWCScdelt(sys); double aa = fabs(cdelt[0]*cdelt[1]); #else - double aa = ptr->getWCSPixelArea(sys); + Vector rr = ptr->getWCSSize(sys); + double aa = rr.area(); #endif area = aa*cnt; } |