Changeset 9954

Timestamp:

Nov 13, 2006, 12:33:20 PM (20 years ago)

Author:

Paul Price

Message:

Writing fringe data using new table functions.

File:

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

trunk/ppMerge/src/ppMergeCombine.c

@@ -78 +78 @@
 #endif
 
+#if 0
 // Write fringe extensions
 static void writeFringes(psMetadata *fringes, // Table of extensions with fringe statistics to write
@@ -103 +104 @@
     return;
 }
-
+#endif
 
 // Combine the inputs
@@ -128 +129 @@
     // Iterate over the FPA
     pmFPA *fpa = data->out;             // Output FPA
-    psMetadata *fringeExtns = psMetadataAlloc(); // List of fringe extensions to write
     pmFPAview *view = pmFPAviewAlloc(0);// View of FPA, for iteration
     int cellNum = -1;                   // Cell number in the whole FPA
@@ -319 +319 @@
                 fringes->data[0] = fringe;
 
-                const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // Name of chip
-                const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of cell
-                psString extname = NULL;
-                psStringAppend(&extname, "FRINGE_%s_%s", chipName, cellName);
-
-                psMetadataAdd(fringeExtns, PS_LIST_TAIL, extname, PS_DATA_UNKNOWN,
-                              "Fringe data to write", fringes);
-                psFree(fringes);
-                psFree(extname);
+                pmFringesFormat(cell, NULL, fringes);
+                psFree(fringes);        // Drop reference
             }
 
@@ -351 +344 @@
 
             // Write the pixels
-            if (cell->hdu) {
+            if (cell->hdu && !cell->hdu->blankPHU) {
                 psTrace("ppMerge", 5, "Writing out cell HDU.\n");
                 pmCellWrite(cell, data->outFile, config->database, false);
+                if (options->fringe) {
+                    pmCellWriteTable(data->outFile, cell, "FRINGE");
+                }
+
                 pmCellFreeData(cell);
-
-                if (options->fringe) {
-                    writeFringes(fringeExtns, data->outFile);
-                }
             }
         }
@@ -370 +363 @@
 
         // Write the pixels
-        if (chip->hdu) {
+        if (chip->hdu && !chip->hdu->blankPHU) {
             psTrace("ppMerge", 5, "Writing out chip HDU.\n");
             pmChipWrite(chip, data->outFile, config->database, false, false);
+            if (options->fringe) {
+                pmChipWriteTable(data->outFile, chip, "FRINGE");
+            }
+
             pmChipFreeData(chip);
-
-            if (options->fringe) {
-                writeFringes(fringeExtns, data->outFile);
-            }
-        }
-    }
-
-    if (data->out->hdu) {
-        // Write the pixels
-        psTrace("ppMerge", 5, "Writing out FPA HDU.\n");
-        pmFPAWrite(data->out, data->outFile, config->database, false, false);
+        }
     }
 
@@ -391 +378 @@
         pmFPA *fpaIn = data->in->data[i]; // Input FPA
         pmFPAFreeData(fpaIn);
-
+    }
+
+    if (data->out->hdu && !data->out->hdu->blankPHU) {
+        // Write the pixels
+        psTrace("ppMerge", 5, "Writing out FPA HDU.\n");
+        pmFPAWrite(data->out, data->outFile, config->database, false, false);
         if (options->fringe) {
-            writeFringes(fringeExtns, data->outFile);
-        }
-    }
+            pmFPAWriteTable(data->outFile, fpa, "FRINGE");
+        }
+    }
+
     pmFPAFreeData(data->out);