Changeset 25022 for branches/eam_branches/20090715/ppMerge/src/ppMergeLoop.c

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeLoop.c (modified) (5 diffs)

branches/eam_branches/20090715/ppMerge/src/ppMergeLoop.c

@@ -65 +65 @@
     int fringeSmoothX = psMetadataLookupS32(NULL, arguments, "FRINGE.XSMOOTH"); // Smoothing regions in x
     int fringeSmoothY = psMetadataLookupS32(NULL, arguments, "FRINGE.YSMOOTH"); // Smoothing regions in y
+    bool fringeSmooth = psMetadataLookupBool(NULL, arguments, "FRINGE.SMOOTH"); // Smooth the output image?
+    float fringeSmoothSigma = psMetadataLookupF32(NULL, arguments, "FRINGE.SMOOTH.SIGMA"); // Smooth the output image?
 
     // set the mask and mark bit values based on the named masks
@@ -150 +152 @@
     pmChip *outChip;                    ///< Chip of interest
     while ((outChip = pmFPAviewNextChip(view, outFPA, 1))) {
+        if (!outChip->process || !outChip->file_exists) {
+            continue;
+        }
         if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
             goto ERROR;
@@ -159 +164 @@
 
         while ((outCell = pmFPAviewNextCell(view, outFPA, 1))) {
+            if (!outCell->process || !outCell->file_exists) {
+                continue;
+            }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                 goto ERROR;
@@ -416 +424 @@
             // Put the new readout into the cell after the existing readouts.
             if (type == PPMERGE_TYPE_FRINGE && outRO) {
-                pmFringeRegions *regions = pmFringeRegionsAlloc(fringeNum, fringeSize, fringeSize,
-                                                                fringeSmoothX, fringeSmoothY);
+                if (fringeSmooth) {
+                    if (outRO->mask) {
+                        psImage *smoothed = psImageSmoothMask (NULL, outRO->image, outRO->mask, maskVal, fringeSmoothSigma, 3, 0.2);
+                        psFree (outRO->image);
+                        outRO->image = smoothed;
+                    } else {
+                        psImageSmooth (outRO->image, fringeSmoothSigma, 3);
+                    }
+                }
+
+                pmFringeRegions *regions = pmFringeRegionsAlloc(fringeNum, fringeSize, fringeSize, fringeSmoothX, fringeSmoothY);
                 pmFringeStats *fringe = pmFringeStatsMeasure(regions, outRO, maskVal);
                 psFree(regions);
@@ -429 +446 @@
                 fringes->data[0] = fringe;
 
-                pmFringesFormat(outCell, NULL, fringes);
+                // XXX replaced this : pmFringesFormat(outCell, NULL, fringes);
+                if (!psMetadataAdd(outCell->analysis, PS_LIST_TAIL, "FRINGE.MEASUREMENTS", PS_DATA_ARRAY, "Fringes", fringes)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to add fringe to analysis metadata\n");
+                    goto ERROR;
+                }
                 psFree(fringes);        // Drop reference
             }