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

Timestamp:

Jan 14, 2010, 10:19:12 AM (17 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/pmPeaks.c (modified) (4 diffs)

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

@@ -375 +375 @@
     psU32 col = 0;
     psU32 row = 0;
-    psArray *list = NULL;
+    psArray *list = psArrayAllocEmpty(100);
 
     // Find peaks in row 0 only.
@@ -416 +416 @@
 
         } else {
-            psError(PS_ERR_UNKNOWN, true, "peak specified valid column range.");
+            psLogMsg ("psModules.objects", 5, "peak specified outside valid column range.");
         }
     }
@@ -501 +501 @@
                 }
             } else {
-                psError(PS_ERR_UNKNOWN, true, "peak specified outside valid column range.");
+                psLogMsg ("psModules.objects", 5, "peak specified outside valid column range.");
             }
 
@@ -545 +545 @@
             }
         } else {
-            psError(PS_ERR_UNKNOWN, true, "peak specified outside valid column range.");
+            psLogMsg ("psModules.objects", 5, "peak specified outside valid column range.");
         }
     }