Changeset 36085 for trunk/psModules/src/objects/pmFootprintCullPeaks.c

Timestamp:

Aug 31, 2013, 5:55:16 AM (13 years ago)

Author:

eugene

Message:

merge changes from EAM branch (pmModel_CentralPixel functions for sersic-like model support; add interactive mode to PCM LMM fitting; harder PCM LMM damping (nu scaled by 3 not 2); add EXT_AND SKY and SHAPE fitting modes, include sky in INDEX-only fits; ifdefs for trace-only values; allow positions to go to 100,000; major re-work of central pixel & flux for sersic-like models; add pmPCMMakeModel function to generate the flux for an arbitrary model

Location:

trunk/psModules

Files:

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

trunk/psModules/src/objects/pmFootprintCullPeaks.c

@@ -25 +25 @@
 bool dumpfootprints (pmFootprint *fp, pmFootprintSpans *fpSp);
 
- /*
-  * Examine the peaks in a pmFootprint, and throw away the ones that are not sufficiently
-  * isolated.  More precisely, for each peak find the highest coll that you'd have to traverse
-  * to reach a still higher peak --- and if that coll's more (less?) than nsigma DN below your
-  * starting point, discard the peak.
-  */
+/*
+ * Examine the peaks in a pmFootprint, and throw away the ones that are not sufficiently
+ * isolated.  More precisely, for each peak find the highest coll that you'd have to traverse
+ * to reach a still higher peak --- and if that coll's more (less?) than nsigma DN below your
+ * starting point, discard the peak.
+ */
 
 # define IN_PEAK 1
@@ -48 +48 @@
 
     if (fp->peaks == NULL || fp->peaks->n < 2) { // nothing to do
-        return PS_ERR_NONE;
+        return PS_ERR_NONE;
     }
 
@@ -91 +91 @@
 
         // max flux is above threshold for brightest peak
-      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;
+        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];
+            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;
 
@@ -130 +130 @@
         }
 #if (0)
-        if (threshbounds->data.F32[threshbounds->n-1] > maxFlux) {
-            psWarning ("upper limit: %f does not include max flux: %f",
-                    threshbounds->data.F32[threshbounds->n-1], maxFlux);
-        }
+        if (threshbounds->data.F32[threshbounds->n-1] > maxFlux) {
+            psWarning ("upper limit: %f does not include max flux: %f",
+                       threshbounds->data.F32[threshbounds->n-1], maxFlux);
+        }
 #endif
         psHistogram *threshist = psHistogramAllocGeneric(threshbounds);