Changeset 25027 for branches/pap/ppMerge/src/ppMergeFiles.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)
• ppMerge/src/ppMergeFiles.c (modified) (4 diffs)

branches/pap/ppMerge/src/ppMergeFiles.c

@@ -39 +39 @@
 {
     pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", num);
-    if (!pmReadoutReadChunk(readout, file->fits, 0, rows, 0, config)) {
+    if (!pmReadoutReadChunk(readout, file->fits, 0, NULL, rows, 0, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read readout.");
         return false;
@@ -46 +46 @@
     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)) {
+        if (!pmReadoutReadChunkMask(readout, file->fits, 0, NULL, rows, 0, config)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read readout mask.");
             return false;
@@ -53 +53 @@
     if (psMetadataLookupBool(&mdok, config->arguments, "INPUTS.VARIANCES")) {
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT.VARIANCE", num);
-        if (!pmReadoutReadChunkVariance(readout, file->fits, 0, rows, 0, config)) {
+        if (!pmReadoutReadChunkVariance(readout, file->fits, 0, NULL, rows, 0, config)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read readout variance.");
             return false;
@@ -220 +220 @@
       case PPMERGE_TYPE_FRINGE:
         outSuffix = "FRINGE";
+        break;
       default:
         psAbort("Unknown frame type: %x", type);