Changeset 25027 for branches/pap/ppStack/src/ppStackThread.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src/ppStackThread.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackThread.c

@@ -187 +187 @@
 
 
+                int zMax = 0;
                 bool keepReading = false;
-                if (pmReadoutMore(ro, imageFits, 0, rows, config)) {
+                if (pmReadoutMore(ro, imageFits, 0, &zMax, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunk(ro, imageFits, 0, rows, overlap, config)) {
+                    if (!pmReadoutReadChunk(ro, imageFits, 0, NULL, rows, overlap, config)) {
                         psError(PS_ERR_IO, false, "Unable to read chunk %d for file PPSTACK.INPUT %d",
                                 numChunk, i);
@@ -198 +199 @@
                 }
 
-                if (pmReadoutMoreMask(ro, maskFits, 0, rows, config)) {
+                if (pmReadoutMoreMask(ro, maskFits, 0, &zMax, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunkMask(ro, maskFits, 0, rows, overlap, config)) {
+                    if (!pmReadoutReadChunkMask(ro, maskFits, 0, NULL, rows, overlap, config)) {
                         psError(PS_ERR_IO, false, "Unable to read chunk %d for file PPSTACK.INPUT.MASK %d",
                                 numChunk, i);
@@ -208 +209 @@
                 }
 
-                if (pmReadoutMoreVariance(ro, varianceFits, 0, rows, config)) {
+                if (pmReadoutMoreVariance(ro, varianceFits, 0, &zMax, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunkVariance(ro, varianceFits, 0, rows, overlap, config)) {
+                    if (!pmReadoutReadChunkVariance(ro, varianceFits, 0, NULL, rows, overlap, config)) {
                         psError(PS_ERR_IO, false,
                                 "Unable to read chunk %d for file PPSTACK.INPUT.VARIANCE %d",