Changeset 18166

Timestamp:

Jun 17, 2008, 12:25:38 PM (18 years ago)

Author:

Paul Price

Message:

New API for reading images.

Location:

trunk/ppMerge/src

Files:

• ppMerge.h (modified) (1 diff)
• ppMergeFiles.c (modified) (3 diffs)
• ppMergeLoop.c (modified) (2 diffs)

trunk/ppMerge/src/ppMerge.h

@@ -45 +45 @@
 
 // Read nominated input file
-bool ppMergeFileReadInput(const pmConfig *config, // Configuration
+bool ppMergeFileReadInput(pmConfig *config, // Configuration
                           pmReadout *readout, // Readout into which to read
                           int num,      // Number of file in sequence

trunk/ppMerge/src/ppMergeFiles.c

@@ -31 +31 @@
 }
 
-bool ppMergeFileReadInput(const pmConfig *config, pmReadout *readout, int num, int rows)
+bool ppMergeFileReadInput(pmConfig *config, pmReadout *readout, int num, int rows)
 {
     pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", num);
-    if (!pmReadoutReadChunk(readout, file->fits, 0, rows, 0, config->database)) {
+    if (!pmReadoutReadChunk(readout, file->fits, 0, rows, 0, config)) {
         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, config->database)) {
+        if (!pmReadoutReadChunkMask(readout, file->fits, 0, rows, 0, config)) {
             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, config->database)) {
+        if (!pmReadoutReadChunkWeight(readout, file->fits, 0, rows, 0, config)) {
             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, config->database)) { \
+                        if (!pmReadoutReadChunk##TYPE(inRO, file->fits, 0, rows, 0, config)) { \
                             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, config->database); \
+                        more &= pmReadoutMore##TYPE(inRO, file->fits, 0, rows, config); \
                     }