Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppSub/src/ppSubDefineOutput.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppSub (modified) (1 prop)
• ppSub/src/ppSubDefineOutput.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/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
     }