Changeset 27517 for branches/eam_branches/20100225/ppStack/src/ppStackCombineFinal.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackCombineFinal.c (modified) (10 diffs)

branches/eam_branches/20100225/ppStack/src/ppStackCombineFinal.c

@@ -14 +14 @@
 //#define TESTING                         // Enable test output
 
-bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack, psArray *covariances,
-                         ppStackOptions *options, pmConfig *config, bool safe, bool normalise)
+bool ppStackCombineFinal(ppStackThreadData *stack, psArray *covariances, ppStackOptions *options,
+                         pmConfig *config, bool safe, bool normalise, bool grow)
 {
     psAssert(stack, "Require stack");
@@ -21 +21 @@
     psAssert(config, "Require configuration");
 
-    if (!target->mask) {
-        target->mask = psImageAlloc(target->image->numCols, target->image->numRows, PS_TYPE_IMAGE_MASK);
+    pmReadout *outRO = options->outRO;                                      // Output readout
+    pmReadout *expRO = options->expRO;                                      // Exposure readout
+    int numCols = outRO->image->numCols, numRows = outRO->image->numRows; // Size of image
+
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
+    psAssert(recipe, "We've thrown an error on this before.");
+    float poorFrac = psMetadataLookupF32(NULL, recipe, "POOR.FRACTION"); // Fraction for "poor"
+
+    // Grow the list of rejected pixels, if desired
+    psArray *reject = psArrayAlloc(options->num); // Pixels rejected for each image
+    for (int i = 0; i < options->num; i++) {
+        if (options->inputMask->data.U8[i]) {
+            continue;
+        }
+        if (grow) {
+            reject->data[i] = pmStackRejectGrow(options->rejected->data[i], numCols, numRows, poorFrac,
+                                                options->regions->data[i], options->kernels->data[i]);
+            if (!reject->data[i]) {
+                psError(psErrorCodeLast(), false, "Unable to grow rejected pixels for image %d", i);
+                psFree(reject);
+                return false;
+            }
+        } else {
+            reject->data[i] = psMemIncrRefCounter(options->rejected->data[i]);
+        }
+    }
+
+    if (!outRO->mask) {
+        outRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
+    }
+    if (!expRO->mask) {
+        expRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
     }
 
@@ -32 +62 @@
             // Something went wrong
             psError(psErrorCodeLast(), false, "Unable to read chunk %d", numChunk);
+            psFree(reject);
             return false;
         }
@@ -39 +70 @@
         }
 
-        // call: ppStackReadoutFinal(config, target, readouts, rejected)
+        // call: ppStackReadoutFinal(config, outRO, readouts, rejected)
         psThreadJob *job = psThreadJobAlloc("PPSTACK_FINAL_COMBINE"); // Job to start
-        psArrayAdd(job->args, 1, target);
         psArrayAdd(job->args, 1, thread);
+        psArrayAdd(job->args, 1, reject);
         psArrayAdd(job->args, 1, options);
         psArrayAdd(job->args, 1, config);
@@ -49 +80 @@
         if (!psThreadJobAddPending(job)) {
             psFree(job);
+            psFree(reject);
             return false;
         }
@@ -56 +88 @@
     if (!psThreadPoolWait(true)) {
         psError(psErrorCodeLast(), false, "Unable to do final combination.");
+        psFree(reject);
         return false;
     }
+
+    psFree(reject);
 
     // Sum covariance matrices
@@ -77 +112 @@
         }
         if (sumWeights > 0.0) {
-            target->covariance = psImageCovarianceSum(covariances);
-            psBinaryOp(target->covariance->image, target->covariance->image, "/",
+            outRO->covariance = psImageCovarianceSum(covariances);
+            psBinaryOp(outRO->covariance->image, outRO->covariance->image, "/",
                        psScalarAlloc(sumWeights, PS_TYPE_F32));
-            psImageCovarianceTransfer(target->variance, target->covariance);
+            psImageCovarianceTransfer(outRO->variance, outRO->covariance);
         }
     } else {
-        target->covariance = psImageCovarianceNone();
+        outRO->covariance = psImageCovarianceNone();
     }
 
@@ -99 +134 @@
             wcsDone = true;
             pmHDU *inHDU = pmHDUFromCell(inRO->parent); // Template HDU
-            pmHDU *outHDU = pmHDUFromCell(target->parent); // Output HDU
-            pmChip *outChip = target->parent->parent; // Output chip
+            pmHDU *outHDU = pmHDUFromCell(outRO->parent); // Output HDU
+            pmChip *outChip = outRO->parent->parent; // Output chip
             pmFPA *outFPA = outChip->parent; // Output FPA
             if (!outHDU || !inHDU) {
@@ -123 +158 @@
     }
 
+    // Set exposure time correctly
+    {
+        float exptime = 0.0;            // Summed exposure time
+        for (int i = 0; i < options->num; i++) {
+            if (options->inputMask) {
+                continue;
+            }
+            exptime += options->exposures->data.F32[i];
+        }
+
+        {
+            psMetadataItem *item = psMetadataLookup(outRO->parent->concepts, "CELL.EXPOSURE");
+            item->data.F32 = exptime;
+        }
+        {
+            psMetadataItem *item = psMetadataLookup(outRO->parent->parent->parent->concepts, "FPA.EXPOSURE");
+            item->data.F32 = exptime;
+        }
+    }
+
     // Put version information into the header
-    pmHDU *hdu = pmHDUFromCell(target->parent);
+    pmHDU *hdu = pmHDUFromCell(outRO->parent);
     if (!hdu) {
         psError(PPSTACK_ERR_PROG, false, "Unable to find HDU for output.");
@@ -140 +195 @@
     psStringAppend(&name, "combined_image_final_%d.fits", pass);
     pass++;
-    ppStackWriteImage(name, NULL, target->image, config);
+    ppStackWriteImage(name, NULL, outRO->image, config);
     psStringSubstitute(&name, "mask", "image");
-    ppStackWriteImage(name, NULL, target->mask, config);
+    ppStackWriteImage(name, NULL, outRO->mask, config);
     psStringSubstitute(&name, "variance", "mask");
-    ppStackWriteImage(name, NULL, target->variance, config);
+    ppStackWriteImage(name, NULL, outRO->variance, config);
     psFree(name);
 
-    pmStackVisualPlotTestImage(target->image, "combined_image_final.fits");
+    pmStackVisualPlotTestImage(outRO->image, "combined_image_final.fits");
 #endif