Changeset 15303

Timestamp:

Oct 12, 2007, 12:29:09 PM (19 years ago)

Author:

Paul Price

Message:

Putting in mechanism to toss out image with insufficient good pixels.

Location:

trunk/ppStack/src

Files:

• ppStackMatch.c (modified) (2 diffs)
• ppStackReadout.c (modified) (5 diffs)

trunk/ppStack/src/ppStackMatch.c

@@ -36 +36 @@
     psMaskType maskBlank = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BLANK"),
                                         config); // Mask for blank reg.
+    float badFrac = psMetadataLookupF32(NULL, recipe, "BADFRAC"); // Maximum bad fraction
     bool optimum = psMetadataLookupBool(&mdok, recipe, "OPTIMUM"); // Derive optimum parameters?
     float optMin = psMetadataLookupF32(&mdok, recipe, "OPTIMUM.MIN"); // Minimum width for search
@@ -61 +62 @@
                             stampsName, target, type, size, order, widths, orders, inner, ringsOrder,
                             binning, optimum, optWidths, optOrder, optThresh, iter, rej, maskBad,
-                            maskBlank)) {
+                            maskBlank, badFrac)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to match images.");
+        psFree(optWidths);
         return false;
     }
+    psFree(optWidths);
 
     return true;

trunk/ppStack/src/ppStackReadout.c

@@ -54 +54 @@
         pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Corresponding readout
 
-        psListAdd(fpaList, PS_LIST_TAIL, inputFile->fpa);
-        psListAdd(cellList, PS_LIST_TAIL, ro->parent);
-
         bool mdok;                      // Status of MD lookup
         float weighting = psMetadataLookupF32(&mdok, inputFile->fpa->analysis,
@@ -91 +88 @@
 #ifndef NO_CONVOLUTION
         if (!ppStackMatch(convolved, ro, sources, config)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to match image %d.", fileNum);
-            psFree(stats);
-            psFree(rng);
-            psFree(fileIter);
-            psFree(fpaList);
-            psFree(cellList);
-            psFree(stack);
-            psFree(outRO);
+            psWarning("Unable to match image %d --- ignoring.", fileNum);
+            psErrorClear();
             psFree(convolved);
-            return false;
+            // XXX Free the bad image so it's not taking up good memory!
+            continue;
         }
 
@@ -213 +205 @@
         }
 
+        psListAdd(fpaList, PS_LIST_TAIL, inputFile->fpa);
+        psListAdd(cellList, PS_LIST_TAIL, ro->parent);
+
         pmStackData *data = pmStackDataAlloc(convolved, weighting); // Data to stack
         psFree(convolved);
@@ -223 +218 @@
     psFree(stats);
     psFree(rng);
+
+    if (fileNum == 0) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Not enough good files to combine.");
+        psFree(fpaList);
+        psFree(cellList);
+        psFree(stack);
+        psFree(outRO);
+        return false;
+    }
 
     if (!pmStackCombine(outRO, stack, maskBad, maskBlank, iter, combineRej)) {
@@ -240 +244 @@
     }
 
-    for (int i = 0; i < num; i++) {
+    for (int i = 0; i < stack->n; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
         psImage *inspected = psPixelsToMask(NULL, data->pixels,