Changeset 34442 for branches/czw_branch/20120906/psModules/src/objects

Timestamp:

Sep 14, 2012, 6:10:32 PM (14 years ago)

Author:

watersc1

Message:

Still doesn't work correctly. I've simplified and corrected the problems I was having before, but I still have residuals of ~50 pixels in the warped background model relative to the science warp. I'm beginning to think that there's some issue with the interpolated background model, and that it's not quite the correct size? That's pretty much all I can think of at this point.

Location:

branches/czw_branch/20120906/psModules/src/objects

Files:

• Makefile.am (modified) (1 diff)
• pmFootprintCullPeaks.c (modified) (1 diff)

branches/czw_branch/20120906/psModules/src/objects/Makefile.am

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

branches/czw_branch/20120906/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;