Changeset 13371

Timestamp:

May 11, 2007, 5:51:36 PM (19 years ago)

Author:

Paul Price

Message:

Works with POIS kernels!

Location:

trunk/ppSub/src

Files:

• ppSubCamera.c (modified) (2 diffs)
• ppSubLoop.c (modified) (1 diff)
• ppSubReadout.c (modified) (7 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -65 +65 @@
 
     // Output image
-    pmFPAfile *output = pmFPAfileDefineOutput(config, NULL, "PPSUB.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(config, input->fpa, "PPSUB.OUTPUT");
     if (!output) {
         psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT"));
@@ -74 +74 @@
         return false;
     }
-    output->fpa = pmFPAConstruct(output->camera);
 
     // Output mask

trunk/ppSub/src/ppSubLoop.c

@@ -102 +102 @@
 
             pmReadout *inRO;           // Readin of interest
-            while ((inRO = pmFPAviewNextReadout(view, input->fpa, 1)) != NULL) {
+            while ((inRO = pmFPAviewNextReadout(view, input->fpa, 1))) {
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     return false;
                 }
                 pmReadout *refRO = pmFPAviewThisReadout(view, reference->fpa);// Reference readout of interest
-                if ((!inRO->data_exists && refRO->data_exists) ||
+                if (!refRO || (!inRO->data_exists && refRO->data_exists) ||
                     (inRO->data_exists && !refRO->data_exists)) {
                     psError(PS_ERR_BAD_PARAMETER_VALUE, true,

trunk/ppSub/src/ppSubReadout.c

@@ -16 +16 @@
     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
@@ -87 +89 @@
     psVector *solution = NULL;          // Solution to match PSF
 
-    for (int i = 0, numRejected = 0; i < iter && numRejected != 0; i++) {
+    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, footprint);
+                                         threshold, spacing, size + footprint);
         if (!stamps) {
             psError(PS_ERR_UNKNOWN, false, "Unable to find stamps on reference image.");
@@ -116 +119 @@
     }
 
-    if (!pmSubtractionConvolve(&outRO->image, &outRO->weight, &outRO->mask,
+    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)) {
@@ -125 +129 @@
     // Do the subtraction
     if (reverse) {
-        (void)psBinaryOp(outRO->image, outRO->image, "-", inRO->image);
+        (void)psBinaryOp(inRO->image, convImage, "-", inRO->image);
     } else {
-        (void)psBinaryOp(outRO->image, inRO->image, "-", outRO->image);
+        (void)psBinaryOp(inRO->image, inRO->image, "-", convImage);
     }
-    (void)psBinaryOp(outRO->mask, outRO->mask, "|", inRO->mask);
-    (void)psBinaryOp(outRO->weight, outRO->weight, "+", inRO->weight);
+    (void)psBinaryOp(inRO->mask, convMask, "|", inRO->mask);
+    (void)psBinaryOp(inRO->weight, convWeight, "+", inRO->weight);
+
+    psFree(convImage);
+    psFree(convMask);
+    psFree(convWeight);
 
 #if 0
     // Generate image with convolution kernels
-    int fullSize = 2 * size + 1;        // Full size of kernel
+    int fullSize = 2 * size + 1 + 1;    // Full size of kernel
     psImage *convKernels = psImageAlloc(5 * fullSize, 5 * fullSize, PS_TYPE_F32);
+    psImageInit(fullSize, NAN);
     for (int j = -2; j <= 2; j++) {
         for (int i = -2; i <= 2; i++) {
@@ -156 +165 @@
 
     // XXX What do we do with this image?
+
+    psFits *kernelFile = psFitsOpen("kernel.fits", "w");
+    (void)psFitsWriteImage(kernelFile, NULL, convKernels, 0, NULL);
+    psFitsClose(kernelFile);
+
     psFree(convKernels);
 #endif
@@ -163 +177 @@
         psFree(stamps);
         psFree(solution);
-        psFree(outRO);
         return true;
 
@@ -170 +183 @@
         psFree(stamps);
         psFree(solution);
-        psFree(outRO);
         return false;
 }