Changeset 23403

Timestamp:

Mar 18, 2009, 12:44:22 PM (17 years ago)

Author:

Paul Price

Message:

Prevent use of multiple readouts on the output fpa.

Location:

trunk/ppSub/src

Files:

• ppSubDefineOutput.c (modified) (1 diff)
• ppSubMatchPSFs.c (modified) (1 diff)

trunk/ppSub/src/ppSubDefineOutput.c

@@ -26 +26 @@
     psAssert(view, "Require view");
 
-    // generate an output readout
     pmCell *outCell = pmFPAfileThisCell(config->files, view, "PPSUB.OUTPUT"); // Output cell
-    pmReadout *outRO = pmReadoutAlloc(outCell); // Output readout: subtraction
     pmFPA *outFPA = outCell->parent->parent; // Output FPA
     pmHDU *outHDU = outFPA->hdu; // Output HDU
     if (!outHDU->header) {
         outHDU->header = psMetadataAlloc();
+    }
+
+    // generate an output readout (first check if it's already there by virtue of kernels)
+    pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT.KERNELS"); // RO with kernel
+    if (!outRO) {
+        outRO = pmReadoutAlloc(outCell); // Output readout: subtraction
     }
 

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -50 +50 @@
 
     // Load pre-calculated kernel, if available
-    pmReadout *kernelRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT.KERNEL"); // RO with kernel
+    pmReadout *kernelRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT.KERNELS"); // RO with kernel
 
     // Sources in image, used for stamps: these must be loaded from previous analysis stages