Changeset 13738

Timestamp:

Jun 8, 2007, 4:47:49 PM (19 years ago)

Author:

Paul Price

Message:

Bug fixes to get the output image and mask (and not the weight if not available) to be written out. Incorporating the new subtraction mask.

Location:

trunk/ppSub/src

Files:

• ppSubCamera.c (modified) (3 diffs)
• ppSubReadout.c (modified) (6 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -82 +82 @@
 
     // Output image
-    pmFPAfile *output = pmFPAfileDefineOutput(config, input->fpa, "PPSUB.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PPSUB.OUTPUT");
     if (!output) {
         psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT"));
@@ -93 +93 @@
 
     // Output mask
-    pmFPAfile *outMask = pmFPAfileDefineOutput(config, output->fpa, "PPSUB.OUTPUT.MASK");
+    pmFPAfile *outMask = pmFPAfileDefineSkycell(config, output->fpa, "PPSUB.OUTPUT.MASK");
     if (!outMask) {
         psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.MASK"));
@@ -104 +104 @@
 
     // Output weight
-    pmFPAfile *outWeight = pmFPAfileDefineOutput(config, output->fpa, "PPSUB.OUTPUT.WEIGHT");
-    if (!outWeight) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.WEIGHT"));
+    if (inputWeight && refWeight) {
+        pmFPAfile *outWeight = pmFPAfileDefineSkycell(config, output->fpa, "PPSUB.OUTPUT.WEIGHT");
+        if (!outWeight) {
+            psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.WEIGHT"));
+            return false;
+        }
+        if (outWeight->type != PM_FPA_FILE_WEIGHT) {
+            psError(PS_ERR_IO, true, "PPSUB.OUTPUT.WEIGHT is not of type WEIGHT");
+            return false;
+        }
+    }
+
+    pmFPAview *view = pmFPAviewAlloc(0);// View to PHU
+    const char *name = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.NAME");
+    if (!pmFPAAddSourceFromView(output->fpa, name, view, output->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to output.");
+        psFree(view);
         return false;
     }
-    if (outWeight->type != PM_FPA_FILE_WEIGHT) {
-        psError(PS_ERR_IO, true, "PPSUB.OUTPUT.WEIGHT is not of type WEIGHT");
-        return false;
-    }
+    psFree(view);
 
     // psPhot input

trunk/ppSub/src/ppSubReadout.c

@@ -10 +10 @@
 #include "ppSub.h"
 
-#define MASK_BAD      0x01              // Mask value for bad pixel
-#define MASK_STAMP    0x02              // Mask value for bad stamp (and bad stamp region)
-
 bool ppSubReadout(pmConfig *config, const pmFPAview *view)
 {
     pmReadout *inRO = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT"); // Input readout
     pmReadout *refRO = pmFPAfileThisReadout(config->files, view, "PPSUB.REF"); // Reference readout
-#if 0
     pmCell *outCell = pmFPAfileThisCell(config->files, view, "PPSUB.OUTPUT"); // Output cell
     pmReadout *outRO = pmReadoutAlloc(outCell); // Output readout
-#endif
 
     psImage *input = inRO->image;       // Input image
@@ -49 +44 @@
     if (!refRO->mask) {
         refRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
-        psImageInit(inRO->mask, 0);
+        psImageInit(refRO->mask, 0);
     }
 
-    // Worried about the masks for bad pixels and bad stamps colliding, so make our own mask
-    psImage *stampMask = psImageAlloc(numCols, numRows, PS_TYPE_MASK); // Mask to use for stamps
-    for (int y = 0; y < numRows; y++) {
-        for (int x = 0; x < numCols; x++) {
-            stampMask->data.PS_TYPE_MASK_DATA[y][x] =
-                (refRO->mask->data.PS_TYPE_MASK_DATA[y][x] & maskBad) ? MASK_BAD : 0;
-        }
-    }
+    // Mask for subtraction
+    psImage *subMask = pmSubtractionMask(inRO->mask, refRO->mask, maskBad, size, footprint);
 
 #if 0
@@ -84 +73 @@
     int numRejected = -1;               // Number of rejected stamps in each iteration
     for (int i = 0; i < iter && numRejected != 0; i++) {
-        stamps = pmSubtractionFindStamps(stamps, refRO->image, stampMask, MASK_BAD, MASK_STAMP,
-                                         threshold, spacing, size + footprint);
+        stamps = pmSubtractionFindStamps(stamps, refRO->image, subMask, threshold, spacing);
         if (!stamps) {
             psError(PS_ERR_UNKNOWN, false, "Unable to find stamps on reference image.");
@@ -103 +91 @@
         }
 
-        numRejected = pmSubtractionRejectStamps(stamps, refRO->image, inRO->image, stampMask, MASK_STAMP,
+        numRejected = pmSubtractionRejectStamps(stamps, refRO->image, inRO->image, subMask,
                                                 solution, footprint, rej, kernels);
         if (numRejected < 0) {
@@ -111 +99 @@
         psLogMsg("ppSub", PS_LOG_INFO, "%d stamps rejected on iteration %d.", numRejected, i);
     }
-    psFree(stampMask);
 
     if (numRejected > 0) {
@@ -122 +109 @@
 
     psImage *convImage = NULL, *convWeight = NULL, *convMask = NULL; // Convolved images
-    if (!pmSubtractionConvolve(&convImage, &convWeight, &convMask,
-                               refRO->image, refRO->weight, refRO->mask,
-                               MASK_BAD, maskBlank, solution, kernels)) {
+    if (!pmSubtractionConvolve(&convImage, &convWeight, &convMask, refRO->image, refRO->weight, subMask,
+                               maskBlank, solution, kernels)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to convolve reference image.");
         goto ERROR;
     }
+    psFree(subMask);
 
     // Do the subtraction
     if (reverse) {
-        (void)psBinaryOp(inRO->image, convImage, "-", inRO->image);
+        outRO->image = (psImage*)psBinaryOp(NULL, convImage, "-", inRO->image);
     } else {
-        (void)psBinaryOp(inRO->image, inRO->image, "-", convImage);
+        outRO->image = (psImage*)psBinaryOp(NULL, inRO->image, "-", convImage);
     }
-    (void)psBinaryOp(inRO->mask, convMask, "|", inRO->mask);
-    (void)psBinaryOp(inRO->weight, convWeight, "+", inRO->weight);
+    outRO->mask = (psImage*)psBinaryOp(NULL, convMask, "|", inRO->mask);
+    if (convWeight) {
+        outRO->weight = (psImage*)psBinaryOp(NULL, convWeight, "+", inRO->weight);
+    }
 
     psFree(convImage);
     psFree(convMask);
     psFree(convWeight);
+
+    outRO->data_exists = true;
+    outCell->data_exists = true;
+    outCell->parent->data_exists = true;
+
+    if (!pmFPACopyConcepts(outCell->parent->parent, inRO->parent->parent->parent)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to copy concepts from input to output.");
+        return false;
+    }
 
 #if 0