Changeset 18030 for trunk/ppMerge

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.

Location:

trunk/ppMerge/src

Files:

• ppMergeFiles.c (modified) (3 diffs)
• ppMergeLoop.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeFiles.c

@@ -34 +34 @@
 {
     pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", num);
-    if (!pmReadoutReadChunk(readout, file->fits, 0, rows, 0)) {
+    if (!pmReadoutReadChunk(readout, file->fits, 0, rows, 0, config->database)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read readout.");
         return false;
@@ -41 +41 @@
     if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS.MASKS")) {
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.MASK", num);
-        if (!pmReadoutReadChunkMask(readout, file->fits, 0, rows, 0)) {
+        if (!pmReadoutReadChunkMask(readout, file->fits, 0, rows, 0, config->database)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read readout mask.");
             return false;
@@ -48 +48 @@
     if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS.WEIGHTS")) {
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.WEIGHT", num);
-        if (!pmReadoutReadChunkWeight(readout, file->fits, 0, rows, 0)) {
+        if (!pmReadoutReadChunkWeight(readout, file->fits, 0, rows, 0, config->database)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read readout weight.");
             return false;

trunk/ppMerge/src/ppMergeLoop.c

@@ -165 +165 @@
                     #define READ_CHUNK(NAME,TYPE) { \
                         pmFPAfile *file = pmFPAfileSelectSingle(config->files, NAME, i); \
-                        if (!pmReadoutReadChunk##TYPE(inRO, file->fits, 0, rows, 0)) { \
+                        if (!pmReadoutReadChunk##TYPE(inRO, file->fits, 0, rows, 0, config->database)) { \
                             psError(PS_ERR_IO, false, "Unable to read chunk %d for file %s %d", \
                                     numChunk, NAME, i); \
@@ -219 +219 @@
                     #define MORE_CHUNK(NAME,TYPE) { \
                         pmFPAfile *file = pmFPAfileSelectSingle(config->files, NAME, i); \
-                        more &= pmReadoutMore##TYPE(inRO, file->fits, 0, rows); \
+                        more &= pmReadoutMore##TYPE(inRO, file->fits, 0, rows, config->database); \
                     }