Changeset 18030 for trunk/ppMerge/src/ppMergeLoop.c

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/ppMerge/src/ppMergeLoop.c (modified) (2 diffs)

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); \
                     }