Changeset 31312 for branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Apr 18, 2011, 8:53:12 AM (15 years ago)

Author:

eugene

Message:

adding flag to mark PASS1 (vs PASS2) detections; moving AP_MAGS flag inot pmSourcePhotometry; bad mask was missing suspect bits (logic error in I/O writing MASK.PSPHOT - added explicitly to maskPoor in PSF_QF_PERFECT; limit Kron radius at upper and lower bounds; use non-linear position errors only for PSF sources in PSF output (extended sources not fitted with non-linear PSF model); make sure pmSourceCopy gets all the elements of the structure that it needs

File:

• branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourcePhotometry.c (modified) (4 diffs)

branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourcePhotometry.c

@@ -310 +310 @@
     bool status;
     status = pmSourcePhotometryAper(&source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal);
+    if (status) {
+        source->mode |= PM_SOURCE_MODE_AP_MAGS;
+    }
 
     return status;
@@ -413 +416 @@
     maskBad &= ~maskSuspect;
 
+    psImageMaskType maskPoor = maskVal | maskSuspect;
+
     // measure modelSum and validSum.  this function is applied to a sources' subimage.  the
     // value of DX is chosen (see above) to cover the full possible size of the subimage if it
@@ -446 +451 @@
 
             // count pixels which are masked with an mask bit (bad or poor)
-            if (!(mask->data.PS_TYPE_IMAGE_MASK_DATA[my][mx] & maskVal)) {
+            if (!(mask->data.PS_TYPE_IMAGE_MASK_DATA[my][mx] & maskPoor)) {
                 notPoorSum += value;
             }
@@ -487 +492 @@
 
     if (isfinite(source->pixWeightNotBad) && isfinite(source->pixWeightNotPoor)) {
-        psAssert (source->pixWeightNotBad <= source->pixWeightNotPoor, "error: all bad pixels should also be poor");
+        psAssert (source->pixWeightNotPoor <= source->pixWeightNotBad, "error: all bad pixels should also be poor");
     }