Changeset 34800 for trunk/psModules/src/objects

Timestamp:

Dec 11, 2012, 2:04:31 PM (13 years ago)

Author:

watersc1

Message:

Merge from my branch including background restoration and stack stage projection cell binned images.

Location:

trunk

Files:

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

trunk/psModules/src/objects/Makefile.am

@@ -111 +111 @@
         pmSourceOutputs.h \
         pmSourceIO.h \
+        pmSourceSatstar.h \ 
         pmSourcePlots.h \
         pmSourceVisual.h \

trunk/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;