Changeset 17157 for branches/pap_branch_080320/ppMerge/src/ppMergeMask.c

Timestamp:

Mar 27, 2008, 2:59:07 PM (18 years ago)

Author:

Paul Price

Message:

Adding count and sigma files as outputs.

File:

• branches/pap_branch_080320/ppMerge/src/ppMergeMask.c (modified) (7 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeMask.c

@@ -44 +44 @@
 
     // For each input file, get the statistics, which can be calculated at the chip or cell levels
-    psArray *suspects = psArrayAlloc(outChip->cells->n); // Images with suspected pixels
     psVector *values = psVectorAlloc(sample, PS_TYPE_F32); // Pixel values for statistics
     pmFPAview *inView = pmFPAviewAlloc(0); // View for input
@@ -100 +99 @@
             }
 
-            psImage *outMask = NULL;    // Output mask image (for iterative generation of mask)
             pmCell *outCell = pmFPAfileThisCell(config->files, inView, "PPMERGE.OUTPUT.MASK"); // Output cell
+            pmReadout *outRO = NULL;    // Output readout
             if (outCell->readouts && outCell->readouts->n == 1) {
-                pmReadout *outRO = outCell->readouts->data[0]; // Output readout
-                if (outRO) {
-                    outMask = outRO->mask;
-                }
-            }
+                outRO = psMemIncrRefCounter(outCell->readouts->data[0]);
+            } else {
+                outRO = pmReadoutAlloc(outCell);
+            }
+            psImage *outMask = outRO->mask;    // Output mask image (for iterative generation of mask)
 
             psImage *image = readout->image, *mask = readout->mask; // Image and mask
@@ -139 +138 @@
                 }
 
-                psMetadataAddF32(readout->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_MEAN, PS_META_REPLACE,
-                                 "Mean value of readout", psStatsGetValue(statistics, meanStat));
-                psMetadataAddF32(readout->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_STDEV, PS_META_REPLACE,
-                                 "Stdev value of readout", psStatsGetValue(statistics, stdevStat));
-                suspects->data[inView->cell] = pmMaskFlagSuspectPixels(suspects->data[inView->cell],
-                                                                       readout, maskSuspect, maskVal);
+                if (!pmMaskFlagSuspectPixels(outRO, readout, psStatsGetValue(statistics, meanStat),
+                                             psStatsGetValue(statistics, stdevStat), maskSuspect, maskVal)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to find suspect values in file %d", i);
+                    psFree(inView);
+                    psFree(readout);
+                    goto MERGE_MASK_ERROR;
+                }
                 pmCellFreeData(inCell);
 
@@ -154 +154 @@
             }
             psFree(readout);
+            psFree(outRO);
         }
 
@@ -172 +173 @@
                 pmReadout *readout = inCell->readouts->data[0]; // Readout of interest
 
-                psMetadataAddF32(readout->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_MEAN, PS_META_REPLACE,
-                                 "Mean value of chip", psStatsGetValue(statistics, meanStat));
-                psMetadataAddF32(readout->analysis, PS_LIST_TAIL, PM_MASK_ANALYSIS_STDEV, PS_META_REPLACE,
-                                 "Stdev value of chip", psStatsGetValue(statistics, stdevStat));
-                suspects->data[inView->cell] = pmMaskFlagSuspectPixels(suspects->data[inView->cell],
-                                                                       readout, maskSuspect, maskVal);
+                inView->readout = 0;
+                pmReadout *outRO = pmFPAfileThisReadout(config->files, inView, "PPMERGE.OUTPUT.MASK");
+
+                if (!pmMaskFlagSuspectPixels(outRO, readout, psStatsGetValue(statistics, meanStat),
+                                             psStatsGetValue(statistics, stdevStat), maskSuspect, maskVal)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to find suspect values in file %d", i);
+                    goto MERGE_MASK_ERROR;
+                }
                 pmCellFreeData(inCell);
 
@@ -210 +213 @@
         psTrace("ppMerge", 1, "Getting bad pixels for chip %d cell %d", outView->chip, outView->cell);
 
-        pmReadout *outRO = NULL;    // Output readout
-        if (outCell->readouts && outCell->readouts->n == 1) {
-            outRO = psMemIncrRefCounter(outCell->readouts->data[0]);
-        } else {
-            outRO = pmReadoutAlloc(outCell);
-        }
-
-        psImage *mask = pmMaskIdentifyBadPixels(suspects->data[outView->cell], maskVal, numFiles, maskBad,
-                                                maskMode);
-        psFree(suspects->data[outView->cell]);
-        suspects->data[outView->cell] = NULL;
+        assert(outCell->readouts && outCell->readouts->n == 1);
+        pmReadout *outRO = outCell->readouts->data[0]; // Output readout
+        if (!pmMaskIdentifyBadPixels(outRO, maskVal, maskBad, maskMode)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to mask bad pixels");
+            goto MERGE_MASK_ERROR;
+        }
+
+        // Supplementary outputs
+        {
+            // The counts image is fairly useless, but it preserves the model
+            pmCell *countsCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.COUNT");
+            pmReadout *countsRO = pmReadoutAlloc(countsCell); // Readout with count of inputs per pixel
+            countsRO->image = psImageAlloc(outRO->image->numCols, outRO->image->numRows, PS_TYPE_F32);
+            psImageInit(countsRO->image, numFiles);
+            countsRO->data_exists = countsCell->data_exists = countsCell->parent->data_exists = true;
+            psFree(countsRO);
+
+            pmCell *sigmaCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.SIGMA");
+            pmReadout *sigmaRO = pmReadoutAlloc(sigmaCell); // Readout with suspect image
+            psImage *suspect = psMetadataLookupPtr(NULL, outRO->analysis, PM_MASK_ANALYSIS_SUSPECT);
+            sigmaRO->image = psImageCopy(sigmaRO->image, suspect, PS_TYPE_F32);
+            psMetadataRemoveKey(outRO->analysis, PM_MASK_ANALYSIS_SUSPECT);
+            sigmaRO->data_exists = sigmaCell->data_exists = sigmaCell->parent->data_exists = true;
+            psFree(sigmaRO);
+        }
+
         if (maskGrowVal > 0) {
-            outRO->mask = psImageGrowMask(outRO->mask, mask, maskVal, maskGrow, maskGrowVal);
-            psFree(mask);
-        } else {
+            psImage *grown = psImageGrowMask(NULL, outRO->mask, maskVal, maskGrow, maskGrowVal); // Grown mask
             psFree(outRO->mask);
-            outRO->mask = mask;
+            outRO->mask = grown;
         }
 
@@ -278 +294 @@
     ppMergeFileActivate(config, PPMERGE_FILES_ALL, true);
 
-    psFree(suspects);
     return true;
 
 
 MERGE_MASK_ERROR:
-    psFree(suspects);
     psFree(statistics);
     psFree(values);