Changeset 20714

Timestamp:

Nov 12, 2008, 9:18:33 PM (17 years ago)

Author:

Paul Price

Message:

Apply threshold to stamps from list. Threshold is now specified as standard deviations above the background, instead of an absolute value.

Location:

trunk/psModules/src/imcombine

Files:

• pmSubtractionMatch.c (modified) (6 diffs)
• pmSubtractionStamps.c (modified) (1 diff)

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -213 +213 @@
     int numCols = ro1->image->numCols, numRows = ro1->image->numRows; // Image dimensions
 
+    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); // Random number generator
+
+    {
+        psStats *bg = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV); // Statistics for backgroun
+        if (!psImageBackground(bg, NULL, ro1->image, ro1->mask, maskVal, rng)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to measure background statistics.");
+            psFree(bg);
+            psFree(rng);
+            goto MATCH_ERROR;
+        }
+        threshold = bg->robustMedian + threshold * bg->robustStdev;
+        psFree(bg);
+        psFree(rng);
+    }
+
     memCheck("start");
 
@@ -270 +285 @@
                 // Get backgrounds
                 psStats *bgStats = psStatsAlloc(BG_STAT); // Statistics for background
-                psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); // Random number generator
                 psVector *buffer = NULL;// Buffer for stats
                 if (!psImageBackground(bgStats, &buffer, ro1->image, ro1->mask, maskVal, rng)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to measure background of image 1.");
                     psFree(bgStats);
-                    psFree(rng);
                     psFree(buffer);
                     goto MATCH_ERROR;
@@ -283 +296 @@
                     psError(PS_ERR_UNKNOWN, false, "Unable to measure background of image 2.");
                     psFree(bgStats);
-                    psFree(rng);
                     psFree(buffer);
                     goto MATCH_ERROR;
@@ -289 +301 @@
                 float bg2 = psStatsGetValue(bgStats, BG_STAT); // Background for image 2
                 psFree(bgStats);
-                psFree(rng);
                 psFree(buffer);
 
@@ -423 +434 @@
         }
     }
+    psFree(rng);
+    rng = NULL;
     psFree(region);
     region = NULL;
@@ -473 +486 @@
     psFree(stamps);
     psFree(weight);
+    psFree(rng);
     return false;
 }

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -301 +301 @@
                     fluxList->n = index;
 
-                    goodStamp = true;
+                    goodStamp = (fluxStamp > threshold) ? true : false;
                 } else {
                     psTrace("psModules.imcombine", 9, "No sources in subregion %d", i);