Changeset 30902

Timestamp:

Mar 14, 2011, 3:04:49 PM (15 years ago)

Author:

eugene

Message:

allows the input weight image to pmFootprintCullPeaks.c to be a S/N or normal Variance image (this allows us to use the smoothed significance image in the footprint analysis

Location:

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

Files:

• pmFootprint.h (modified) (1 diff)
• pmFootprintCullPeaks.c (modified) (3 diffs)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmFootprint.h

@@ -85 +85 @@
                                  const float fPadding, // fractional padding added to stdev since bright peaks have unreasonably high significance
                                  const float min_threshold, // minimum permitted coll height
-                                 const float max_threshold // maximum permitted coll height
+                                 const float max_threshold,// maximum permitted coll height
+                                 const bool isWeightVar // the input weight may be variance (sigma^2) or S/N (1/sigma)
     );
 

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

@@ -39 +39 @@
                                  const float fPadding, // fractional padding added to stdev since bright peaks have unreasonably high significance
                                  const float min_threshold, // minimum permitted coll height
-                                 const float max_threshold) { // maximum permitted coll height
+                                 const float max_threshold,
+                                 const bool isWeightVar
+    ) { // maximum permitted coll height
     assert (img != NULL); assert (img->type.type == PS_TYPE_F32);
     assert (weight != NULL); assert (weight->type.type == PS_TYPE_F32);
@@ -98 +100 @@
         // float threshold = subImg->data.F32[y][x] - nsigma_delta*stdev;
 
-        const float stdev = sqrt(subWt->data.F32[y][x]);
-        const float flux = subImg->data.F32[y][x];
-        const float fStdev = fabs(stdev/flux);
-        const float stdev_pad = fabs(flux * hypot(fStdev, fPadding));
+        float stdev = 0.0;
+        float flux = 0.0;
+        if (isWeightVar) {
+            flux = subImg->data.F32[y][x];
+            stdev = sqrt(subWt->data.F32[y][x]);
+        } else {
+            flux = subImg->data.F32[y][x];
+            stdev = flux / sqrt(subWt->data.F32[y][x]); // should be 1/sqrt(subWT)
+        }
+        const float fStdev = fabs(stdev/flux);
+        const float stdev_pad = fabs(flux * hypot(fStdev, fPadding));
+
         // if flux is negative, careful with fStdev
 
@@ -124 +134 @@
         }
 
+        // XXX can we / should we use pmFootprintsFind() if the starting footprint is too large?
         // init peakFootprint here?
         pmFootprintsFindAtPoint(peakFootprint, peakFPSpans, subImg, subMask, threshold, brightPeaks, peak->y, peak->x);