Changeset 30720

Timestamp:

Feb 21, 2011, 9:02:36 AM (15 years ago)

Author:

eugene

Message:

fix mis-counting on the aperture fluxes

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotRadialApertures.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotRadialApertures.c

@@ -227 +227 @@
     for (int i = 0; i < pixRadius2->n; i++, rPix2++) {
 
+        int j = 0;
         float *aRad2 = aperRadii2->data.F32;
-        for (int j = 0; (*rPix2 < *aRad2) && (j < aperRadii2->n); j++, aRad2++) {
+        for (; (*aRad2 < *rPix2) && (j < aperRadii2->n); j++, aRad2++);
+        for (; j < aperRadii2->n; j++, aRad2++) {
             flux->data.F32[j]    += pixFlux->data.F32[i];
             fluxStd->data.F32[j] += PS_SQR(pixFlux->data.F32[i]);
@@ -250 +252 @@
         float SBstdv = sqrt((fluxStd->data.F32[i] / nPix) - PS_SQR(SBmean));
 
-        flux->data.F32[i]    = SBmean * Area;
+        // flux->data.F32[i]    = SBmean * Area;
         fluxStd->data.F32[i] = SBstdv * Area;
         fluxErr->data.F32[i] = sqrt(fluxErr->data.F32[i]) * Area / nPix;
 
-        fill->data.F32[i] /= Area;
-        psTrace ("psphot", 5, "radial bins: %3d  %5.1f : %8.1f +/- %7.2f : %4.2f %6.1f\n", 
-                 i, aperRadii->data.F32[i], flux->data.F32[i], fluxErr->data.F32[i], fill->data.F32[i], Area);
+        // fill->data.F32[i] /= Area;
+        psTrace ("psphot", 5, "radial bins: %3d  %5.1f : %8.1f +/- %7.2f : %8.1f +/- %8.1f : %4.2f %6.1f\n", 
+                 i, aperRadii->data.F32[i], flux->data.F32[i], fluxErr->data.F32[i], SBmean, SBstdv, fill->data.F32[i], Area);
     }