Changeset 34838 for branches/eam_branches/ipp-20121130/psModules/src/objects/pmFootprintCullPeaks.c

Timestamp:

Dec 18, 2012, 5:56:48 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmFootprintCullPeaks.c (modified) (1 diff)

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

@@ -91 +91 @@
 
         // max flux is above threshold for brightest peak
-        pmPeak *maxPeak = fp->peaks->data[0];
+      pmPeak *maxPeak = NULL;
+      for (int i = 0; i < fp->peaks->n; i++) {
+        pmPeak *testPeak = fp->peaks->data[i];
+        float this_peak = useSmoothedImage ? testPeak->smoothFlux : testPeak->rawFlux;
+        
+        if (isfinite(this_peak)) {
+          maxPeak = fp->peaks->data[i];
+          break;
+        }
+      }
+      psAssert(maxPeak,"maxPeak was not set in these peaks");
+      //      = fp->peaks->data[0];
         float maxFlux = useSmoothedImage ? maxPeak->smoothFlux : maxPeak->rawFlux;