Changeset 31443 for branches/eam_branches/ipp-20110404/psModules/src/objects

Timestamp:

May 5, 2011, 10:11:07 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

Location:

branches/eam_branches/ipp-20110404/psModules/src/objects

Files:

• pmFootprintAssignPeaks.c (modified) (2 diffs)
• pmFootprintCullPeaks.c (modified) (1 diff)
• pmFootprintIDs.c (modified) (1 diff)

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

@@ -35 +35 @@
     assert (peaks->n == 0 || psMemCheckPeak(peaks->data[0]));
     
-    if (footprints->n == 0) {
-        if (peaks->n > 0) {
-            return psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Your list of footprints is empty");
-        }
+    if ((footprints->n == 0) && (peaks->n == 0)) {
         return PS_ERR_NONE;
     }
+
     /*
      * Create an image filled with the object IDs, and use it to assign pmPeaks to the
@@ -59 +57 @@
         
         if (ids) { assert (x >= 0 && x < numCols && y >= 0 && y < numRows);}
-        int id = ids ? ids->data.S32[y][x - col0] : 0;
-        // XXX I think the '[x - col0]' above is just wrong (should be [x], but never gets triggerd.
+        int id = ids ? ids->data.S32[y][x] : 0;
 
         if (id == 0) {                  // peak isn't in a footprint, so make one for it

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

@@ -102 +102 @@
         float beta = nsigma_delta * ALPHA;
         float beta2 = PS_SQR(beta);
-        int nBins = sqrt(4.0*(maxFlux - min_threshold)/beta2) + 10; // let's be extra generous
+        float value = 4.0*(maxFlux - min_threshold)/beta2;
+        int nBins = (value > 1.0) ? sqrt(value) + 10 : 10; // let's be extra generous
 
         // create a vector to store the threshold bins used for each peak

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

@@ -66 +66 @@
 
    if (footprints->n == 0) {
-       // XXX this was an error, but is an allowed condition -- NULL returned image means no footprints for any peaks
-       // psError(PS_ERR_BAD_PARAMETER_SIZE, true, "You didn't provide any footprints");
        return NULL;
    }