Changeset 34415 for branches/eam_branches/ipp-20120905/psphot/src/psphotSourceSize.c

Timestamp:

Sep 7, 2012, 10:06:48 AM (14 years ago)

Author:

eugene

Message:

when growing the CR mask, copy the values into the existing readout->mask array, otherwise we lose the association to source->maskView; mask a small region for sources that have already been detected (the exclusion radius is curretnly set to 4 pixels, and is not user-specified; deactivate some test code; saturate linear fit fluxes to min valid flux (probably superfluous); calls to psphotFitSourcesLinear in psphotReadout should skip negative fluxes

File:

• branches/eam_branches/ipp-20120905/psphot/src/psphotSourceSize.c (modified) (1 diff)

branches/eam_branches/ipp-20120905/psphot/src/psphotSourceSize.c

@@ -675 +675 @@
             return false;
         }
-        psFree(readout->mask);
-        readout->mask = newMask;
+        // Copy the new mask pixel values to the old mask array.  NOTE: we cannot replace
+        // the mask pointer because the source->maskView objects point to the old data
+        // area
+        psImage *oldMask = readout->mask;
+        readout->mask = psImageCopy (readout->mask, newMask, PS_TYPE_IMAGE_MASK);
+        psAssert (oldMask == readout->mask, "should have copied the values in-situ");
+        psFree(newMask);
     }