Changeset 25787

Timestamp:

Oct 6, 2009, 11:42:05 AM (17 years ago)

Author:

Paul Price

Message:

Working on getting unconvolved stack out at the same time.

Location:

branches/pap/ppStack/src

Files:

• ppStackCamera.c (modified) (1 diff)
• ppStackCombinePrepare.c (modified) (3 diffs)
• ppStackFiles.c (modified) (1 diff)
• ppStackOptions.c (modified) (2 diffs)
• ppStackOptions.h (modified) (1 diff)

branches/pap/ppStack/src/ppStackCamera.c

@@ -294 +294 @@
         targetPSF->save = true;
     }
+
+#if 0
+    // Unconvolved stack
+    pmFPAfile *unConv = pmFPAfileDefineOutput(config, fpa, "PPSTACK.OUTPUT.UNCONV");
+    psFree(fpa);                        // Drop reference
+    if (!unConv) {
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PPSTACK.OUTPUT.UNCONV"));
+        return false;
+    }
+    if (unConv->type != PM_FPA_FILE_IMAGE) {
+        psError(PS_ERR_IO, true, "PPSTACK.OUTPUT.UNCONV is not of type IMAGE");
+        return false;
+    }
+    unConv->save = true;
+
+    if (!pmFPAAddSourceFromFormat(fpa, "Stack", unConv->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
+        psFree(fpa);
+        return false;
+    }
+#endif
 
     // Output JPEGs

branches/pap/ppStack/src/ppStackCombinePrepare.c

@@ -33 +33 @@
     pmCell *outCell = pmFPAfileThisCell(config->files, view, "PPSTACK.OUTPUT"); // Output cell
     options->outRO = pmReadoutAlloc(outCell); // Output readout
+    options->unconvRO = pmReadoutAlloc(outCell); // Unconvolved readout
     psFree(view);
 
@@ -39 +40 @@
     psString maskBadStr = psMetadataLookupStr(NULL, recipe, "MASK.BAD"); // Name of bits to mask for bad
     psImageMaskType maskBad = pmConfigMaskGet(maskBadStr, config); // Bits to mask for bad pixels
+
     if (!pmReadoutStackDefineOutput(options->outRO, col0, row0, numCols, numRows, true, true, maskBad)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to prepare output.");
@@ -44 +46 @@
     }
 
+    options->unconvRO->image = psImageCopy(NULL, options->outRO->image, PS_TYPE_F32);
+//    options->unconvRO->mask = psImageCopy(NULL, options->outRO->mask, PS_TYPE_IMAGE_MASK);
+    options->unconvRO->col0 = options->outRO->col0;
+    options->unconvRO->row0 = options->outRO->row0;
+
+
+
     return true;
 }

branches/pap/ppStack/src/ppStackFiles.c

@@ -22 +22 @@
 /// Output files for the combination
 static char *filesCombine[] = { "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.VARIANCE",
-                                "PPSTACK.OUTPUT.JPEG1", "PPSTACK.OUTPUT.JPEG2", NULL };
+                                "PPSTACK.UNCONV", "PPSTACK.OUTPUT.JPEG1", "PPSTACK.OUTPUT.JPEG2", NULL };
 
 /// Files for photometry

branches/pap/ppStack/src/ppStackOptions.c

@@ -26 +26 @@
     psFree(options->covariances);
     psFree(options->outRO);
+    psFree(options->unconvRO);
     psFree(options->inspect);
     psFree(options->rejected);
@@ -56 +57 @@
     options->covariances = NULL;
     options->outRO = NULL;
+    options->unconvRO = NULL;
     options->inspect = NULL;
     options->rejected = NULL;

branches/pap/ppStack/src/ppStackOptions.h

@@ -29 +29 @@
     // Combine initial
     pmReadout *outRO;                   // Output readout
+    pmReadout *unconvRO;                // Unconvolved readout
     psArray *inspect;                   // Array of arrays of pixels to inspect
     // Rejection