Changeset 24951 for branches/czw_branch/cleanup/ppMerge/src/ppMergeFiles.c

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeFiles.c (modified) (4 diffs)

branches/czw_branch/cleanup/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);