Changeset 31384 for branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Apr 26, 2011, 5:54:39 PM (15 years ago)

Author:

eugene

Message:

pmSourceCopy and pmPeakCopy should copy all appropriate values; do not fit sources with moments failures

File:

• branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c (modified) (2 diffs)

branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c

@@ -137 +137 @@
         if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
 
+        // do not include MOMENTS_FAILURES in the fit
+        if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) continue;
+
         // XXX count saturated stars
         if (source->mode & PM_SOURCE_MODE_SATSTAR) {
@@ -166 +169 @@
         // apply mask?
         float modelSum = 0.0;
+        float maskedSum = 0.0;
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
             for (int ix = 0; ix < source->modelFlux->numCols; ix++) {
                 modelSum += source->modelFlux->data.F32[iy][ix];
+                if (source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskVal) continue;
+                maskedSum += source->modelFlux->data.F32[iy][ix];
             }
         }
         if (modelSum < 0.5) continue; // skip sources with no model constraint (somewhat arbitrary limit)
         if (modelSum < 0.8) {
-            fprintf (stderr, "low-sig model @ %f, %f (%f sum, %f peak)\n",
-                     source->peak->xf, source->peak->yf, modelSum, source->peak->rawFlux);
+            fprintf (stderr, "low-sig model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+                     source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
+        }
+        if (maskedSum < 0.5) {
+            fprintf (stderr, "worrying model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+                     source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
         }