Changeset 26594 for branches/eam_branches/20091201/psModules/src/objects/pmSourceMoments.c

Timestamp:

Jan 14, 2010, 10:19:12 AM (16 years ago)

Author:

eugene

Message:

pmSourceMoments now takes a mask value and correctly ANDs the image mask against that (needed to handle SUSPECT as opposed to BAD pixels); pmPeaks returns an empty, but non NON peak array if no peaks are found (this is a valid result)

File:

• branches/eam_branches/20091201/psModules/src/objects/pmSourceMoments.c (modified) (3 diffs)

branches/eam_branches/20091201/psModules/src/objects/pmSourceMoments.c

@@ -54 +54 @@
 # define VALID_RADIUS(X,Y,RAD2) (((RAD2) >= (PS_SQR(X) + PS_SQR(Y))) ? 1 : 0)
 
-bool pmSourceMoments(pmSource *source, psF32 radius, psF32 sigma, psF32 minSN)
+bool pmSourceMoments(pmSource *source, psF32 radius, psF32 sigma, psF32 minSN, psImageMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(source, false);
@@ -114 +114 @@
         for (psS32 col = 0; col < source->pixels->numCols ; col++, vPix++, vWgt++) {
             if (vMsk) {
-                if (*vMsk) {
+                if (*vMsk & maskVal) {
                     vMsk++;
                     continue;
@@ -226 +226 @@
         for (psS32 col = 0; col < source->pixels->numCols ; col++, vPix++, vWgt++) {
             if (vMsk) {
-                if (*vMsk) {
+                if (*vMsk & maskVal) {
                     vMsk++;
                     continue;