Changeset 15651

Timestamp:

Nov 19, 2007, 12:22:18 PM (18 years ago)

Author:

Paul Price

Message:

ppMerge wasn't calling pmFPAUpdateNames, so output headers didn't have required keywords.

Location:

trunk/ppMerge/src

Files:

• ppMergeCombine.c (modified) (3 diffs)
• ppMergeMask.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCombine.c

@@ -108 +108 @@
     pmFPAview *view = pmFPAviewAlloc(0);// View of FPA, for iteration
     int cellNum = -1;                   // Cell number in the whole FPA
+    if (data->out->hdu) {
+        pmFPAUpdateNames(data->out, NULL, NULL);
+    }
     pmFPAWrite(data->out, data->outFile, config->database, true, false); // Write header only
     pmChip *chip;                       // Chip of interest
@@ -116 +119 @@
     }
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-        if (chip->hdu && chip->hdu->header) {
-            // Data will exist soon
-            chip->data_exists = true;
+        if (chip->hdu) {
+            pmFPAUpdateNames(data->out, chip, NULL);
+            if (chip->hdu->header) {
+                // Data will exist soon
+                chip->data_exists = true;
+            }
         }
         pmChipWrite(chip, data->outFile, config->database, true, false); // Write header only
@@ -124 +130 @@
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
             cellNum++;
-            if (cell->hdu && cell->hdu->header) {
-                // Data will exist soon
-                chip->data_exists = true;
+            if (cell->hdu) {
+                pmFPAUpdateNames(data->out, chip, cell);
+                if (cell->hdu->header) {
+                    // Data will exist soon
+                    chip->data_exists = true;
+                }
             }
             pmCellWrite(cell, data->outFile, config->database, true); // Write header only

trunk/ppMerge/src/ppMergeMask.c

@@ -85 +85 @@
 
     pmFPAview *view = pmFPAviewAlloc(0);// View of FPA, for iteration
+    if (fpaOut->hdu) {
+        pmFPAUpdateNames(fpaOut, NULL, NULL);
+    }
     pmFPAWriteMask(fpaOut, data->outFile, config->database, true, false); // Write header only
     pmChip *chipOut;                    // Output chip of interest
     while ((chipOut = pmFPAviewNextChip(view, fpaOut, 1))) {
+        if (chipOut->hdu) {
+            pmFPAUpdateNames(fpaOut, chipOut, NULL);
+        }
         pmChipWriteMask(chipOut, data->outFile, config->database, true, false); // Write header only
         pmCell *cellOut;                   // Output cell of interest
         while ((cellOut = pmFPAviewNextCell(view, fpaOut, 1))) {
+            if (cellOut->hdu) {
+                pmFPAUpdateNames(fpaOut, chipOut, cellOut);
+            }
             pmCellWriteMask(cellOut, data->outFile, config->database, true); // Write header only