Changeset 18030 for trunk/ppStack

Timestamp:

Jun 9, 2008, 1:00:32 PM (18 years ago)

Author:

Paul Price

Message:

Read functions for readouts need to take a database handle so they can read the concepts.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (4 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -430 +430 @@
                 }
 
-                if (!pmReadoutReadChunk(readout, imageFits->data[i], 0, numScans, overlap) ||
-                    !pmReadoutReadChunkMask(readout, maskFits->data[i], 0, numScans, overlap) ||
-                    !pmReadoutReadChunkWeight(readout, weightFits->data[i], 0, numScans, overlap)) {
+                if (!pmReadoutReadChunk(readout, imageFits->data[i], 0, numScans, overlap,
+                                        config->database) ||
+                    !pmReadoutReadChunkMask(readout, maskFits->data[i], 0, numScans, overlap,
+                                            config->database) ||
+                    !pmReadoutReadChunkWeight(readout, weightFits->data[i], 0, numScans, overlap,
+                                              config->database)) {
                     psError(PS_ERR_IO, false, "Unable to read chunk %d for file %d", numChunk, i);
                     psFree(readouts);
@@ -471 +474 @@
                     continue;
                 }
-                more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans);
-                more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans);
-                more &= pmReadoutMoreWeight(readout, weightFits->data[i], 0, numScans);
+                more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans, config->database);
+                more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans, config->database);
+                more &= pmReadoutMoreWeight(readout, weightFits->data[i], 0, numScans, config->database);
             }
         }
@@ -551 +554 @@
                 assert(readout);
 
-                if (!pmReadoutReadChunk(readout, imageFits->data[i], 0, numScans, 0) ||
-                    !pmReadoutReadChunkMask(readout, maskFits->data[i], 0, numScans, 0) ||
-                    !pmReadoutReadChunkWeight(readout, weightFits->data[i], 0, numScans, 0)) {
+                if (!pmReadoutReadChunk(readout, imageFits->data[i], 0, numScans, 0, config->database) ||
+                    !pmReadoutReadChunkMask(readout, maskFits->data[i], 0, numScans, 0, config->database) ||
+                    !pmReadoutReadChunkWeight(readout, weightFits->data[i], 0, numScans, 0,
+                                              config->database)) {
                     psError(PS_ERR_IO, false, "Unable to read chunk %d for file %d", numChunk, i);
                     psFree(readouts);
@@ -593 +597 @@
                     continue;
                 }
-                more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans);
-                more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans);
-                more &= pmReadoutMoreWeight(readout, weightFits->data[i], 0, numScans);
+                more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans, config->database);
+                more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans, config->database);
+                more &= pmReadoutMoreWeight(readout, weightFits->data[i], 0, numScans, config->database);
             }
         }