Changeset 16601

Timestamp:

Feb 22, 2008, 9:19:13 AM (18 years ago)

Author:

Paul Price

Message:

Adding overlap so that incremental reads can handle convolution.

File:

• branches/pap_branch_080207/ppStack/src/ppStackLoop.c (modified) (2 diffs)

branches/pap_branch_080207/ppStack/src/ppStackLoop.c

@@ -209 +209 @@
     int num = psMetadataLookupS32(NULL, config->arguments, "INPUTS.NUM"); // Number of inputs
     int numScans = psMetadataLookupS32(NULL, config->arguments, "ROWS"); // Number of scans to read at once
-
-
-
-    // XXX Will need to adjust this when we're doing the convolution
-    int overlap = 0;                    // Overlap between consecutive scans
-
-
-
+    psMetadata *ppsub = psMetadataLookupMetadata(NULL, config->recipes, "PPSUB"); // PPSUB recipe
+    int overlap = 2 * psMetadataLookupS32(NULL, ppsub, "KERNEL.SIZE"); // Overlap by kernel size between consecutive scans
 
     // Preparation iteration: Load the sources, and get a target PSF model
@@ -424 +418 @@
                 pmReadout *readout = readouts->data[i];
                 assert(readout);
-                more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans, overlap);
-                more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans, overlap);
-                more &= pmReadoutMoreWeight(readout, weightFits->data[i], 0, numScans, overlap);
+                more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans);
+                more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans);
+                more &= pmReadoutMoreWeight(readout, weightFits->data[i], 0, numScans);
             }
         }