Changeset 31606 for branches/czw_branch/20110406/psphot/src/psphotRadialApertures.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotRadialApertures.c (modified) (2 diffs)

branches/czw_branch/20110406/psphot/src/psphotRadialApertures.c

@@ -95 +95 @@
         if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
         if (source->mode & PM_SOURCE_MODE_DEFECT) continue;
-        if (source->mode & PM_SOURCE_MODE_SATSTAR) continue;
+
+        // XXX measure radial apertures even for saturated stars
+        // if (source->mode & PM_SOURCE_MODE_SATSTAR) continue;
 
         // limit selection to some SN limit
@@ -257 +259 @@
         float SBstdv = sqrt((fluxStd->data.F32[i] / nPix) - PS_SQR(SBmean));
 
+        // XXX report the total flux or the mask-corrected flux?
         // flux->data.F32[i]    = SBmean * Area;
+        // fluxErr->data.F32[i] = sqrt(fluxErr->data.F32[i]) * Area / nPix;
+
+        fluxErr->data.F32[i] = sqrt(fluxErr->data.F32[i]);
         fluxStd->data.F32[i] = SBstdv * Area;
-        fluxErr->data.F32[i] = sqrt(fluxErr->data.F32[i]) * Area / nPix;
-
-        // 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);