Changeset 15654 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Nov 19, 2007, 3:32:20 PM (18 years ago)

Author:

Paul Price

Message:

Ensuring data_exists flag is set at the appropriate time.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -120 +120 @@
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
         if (chip->hdu) {
+            // Data will exist soon
             pmFPAUpdateNames(data->out, chip, NULL);
-            if (chip->hdu->header) {
-                // Data will exist soon
-                chip->data_exists = true;
-            }
+            chip->data_exists = true;
         }
         pmChipWrite(chip, data->outFile, config->database, true, false); // Write header only
@@ -131 +129 @@
             cellNum++;
             if (cell->hdu) {
+                // Data will exist soon
                 pmFPAUpdateNames(data->out, chip, cell);
-                if (cell->hdu->header) {
-                    // Data will exist soon
-                    chip->data_exists = true;
-                }
+                chip->data_exists = cell->data_exists = true;
             }
             pmCellWrite(cell, data->outFile, config->database, true); // Write header only