Changeset 5104 for trunk/archive/scripts/src/phase2/pmFPAConstruct.c

Timestamp:

Sep 22, 2005, 4:54:52 PM (21 years ago)

Author:

Paul Price

Message:

Working under pslib-0.7.0, but don't have the inner loop behaving yet.

File:

• trunk/archive/scripts/src/phase2/pmFPAConstruct.c (modified) (14 diffs)

trunk/archive/scripts/src/phase2/pmFPAConstruct.c

@@ -30 +30 @@
         psError(PS_ERR_IO, false, "Unable to find specs for cell %s: ignored\n", cellName);
     }
+
+#if 0
+    // Need to create a new instance, so that each cell can work with its own
+    psMetadata *copy = psMetadataAlloc();
+    psMetadataIterator *iter = psMetadataIteratorAlloc(cellData, PS_LIST_HEAD, NULL); // Iterator
+    psMetadataItem *item = NULL;        // Item from iteration
+    while (item = psMetadataGetAndIncrement(iter)) {
+        if (item->type == PS_META_MULTI || item->type == PS_META_META) {
+            psLogMsg(__func__, PS_LOG_WARN, "PS_META_MULTI and PS_META_META are not supported in a cell "
+                     "definition --- %s ignored.\n", item->name);
+            continue;
+        }
+        if (! psMetadataAdd(copy, PS_LIST_TAIL, item->name, item->type, item->comment, item->data.V)) {
+            psAbort(__func__, "Should never reach here!\n");
+        }
+    }
+    psFree(iter);
+
+    return copy;
+#else
     return cellData;
+#endif
+
 }
 
@@ -38 +60 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-pmFPA *pmFPAConstruct(const psMetadata *camera, // The camera configuration
-                      psDB *db          // Database handle
+pmFPA *pmFPAConstruct(const psMetadata *camera // The camera configuration
     )
 {
-    pmFPA *fpa = pmFPAAlloc(camera, db); // The FPA to fill out
+    pmFPA *fpa = pmFPAAlloc(camera); // The FPA to fill out
     bool mdStatus = true;               // Status from metadata lookups
     const char *phuType = psMetadataLookupString(&mdStatus, camera, "PHU"); // What is the PHU?
@@ -67 +88 @@
                 psString extName = contentItem->name; // The name of the extension
                 pmChip *chip = pmChipAlloc(fpa, extName); // The chip
-                chip->extname = extName;// Mark chip to receive FITS data
+                chip->private = p_pmHDUAlloc(extName); // Prepare chip to receive FITS data
                 if (contentItem->type != PS_META_STR) {
                     psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
@@ -83 +104 @@
                     psMetadata *cellData = getCellData(camera, cellName);
                     pmCell *cell = pmCellAlloc(chip, cellData, cellName); // The cell
+//                  psFree(cellData);
                 }
                 psFree(cellNamesIter);
@@ -102 +124 @@
                 const char *content = contentItem->data.V; // The content of the extension
                 psList *contents = papSplit(content, ": "); // Split the name from the type
-                if (contents->size != 2) {
+                if (contents->n != 2) {
                     psLogMsg(__func__, PS_LOG_WARN, "Unable to read contents of %s: ignored.\n", extName);
                 } else {
@@ -123 +145 @@
                     psMetadata *cellData = getCellData(camera, cellType);
                     pmCell *cell = pmCellAlloc(chip, cellData, extName); // The cell
-                    cell->extname = extName; // Mark cell to receive FITS data
+//                  psFree(cellData);
+                    cell->private = p_pmHDUAlloc(extName); // Prepare cell to receive FITS data
 
                     psFree(chip);
                     psFree(cell);
-                    psFree(chipName);
-                    psFree(cellType);
                 }
                 psFree(contents);
@@ -136 +157 @@
         } else if (strcasecmp(extType, "NONE") == 0) {
             // No extensions; Content contains metadata, each entry is a chip with its component cells
-            fpa->extname = "PHU";
+            fpa->private = p_pmHDUAlloc("PHU"); // Prepare FPA to receive FITS data
             while (contentItem = psMetadataGetAndIncrement(contentsIter)) {
                 psString chipName = contentItem->name; // The name of the chip
@@ -155 +176 @@
                     psMetadata *cellData = getCellData(camera, cellName);
                     pmCell *cell = pmCellAlloc(chip, cellData, cellName); // The cell
+//                  psFree(cellData);
                 }
                 psFree(cellNamesIter);
@@ -174 +196 @@
         if (strcasecmp(extType, "NONE") == 0) {
             // There are no extensions --- only the PHU
-            chip->extname = "PHU";
+            chip->private = p_pmHDUAlloc("PHU");
 
             const char *contents = psMetadataLookupString(&mdStatus, camera, "CONTENTS");
@@ -188 +210 @@
                 psMetadata *cellData = getCellData(camera, cellName);
                 pmCell *cell = pmCellAlloc(chip, cellData, cellName); // The cell
+//              psFree(cellData);
             }
             psFree(cellIter);
@@ -223 +246 @@
                 psMetadata *cellData = getCellData(camera, cellType);
                 pmCell *cell = pmCellAlloc(chip, cellData, extName); // The cell
-                cell->extname = extName; // Mark cell to receive FITS data
+//              psFree(cellData);
+                cell->private = p_pmHDUAlloc(extName); // Prepare cell to receive FITS data
             } // Iterating through contents
             psFree(contentsIter);
@@ -249 +273 @@
 {
     psTrace(__func__, 0, "FPA:\n");
-    if (fpa->extname) {
-        psTrace(__func__, 1, "---> FPA is extension %s.\n", fpa->extname);
-        if (! fpa->pixels) {
-            psTrace(__func__, 1, "---> NO PIXELS for extension %s\n", fpa->extname);
+    if (fpa->private) {
+        psTrace(__func__, 1, "---> FPA is extension %s.\n", fpa->private->extname);
+        if (! fpa->private->pixels) {
+            psTrace(__func__, 1, "---> NO PIXELS for extension %s\n", fpa->private->extname);
         }
     }
@@ -261 +285 @@
         psTrace(__func__, 1, "Chip: %d\n", i);
         pmChip *chip = chips->data[i]; // The chip
-        if (chip->extname) {
-            psTrace(__func__, 2, "---> Chip is extension %s.\n", chip->extname);
-            if (! chip->pixels) {
-                psTrace(__func__, 2, "---> NO PIXELS for extension %s\n", chip->extname);
+        if (chip->private) {
+            psTrace(__func__, 2, "---> Chip is extension %s.\n", chip->private->extname);
+            if (! chip->private->pixels) {
+                psTrace(__func__, 2, "---> NO PIXELS for extension %s\n", chip->private->extname);
             }
         }
@@ -272 +296 @@
             psTrace(__func__, 2, "Cell: %d\n", j);
             pmCell *cell = cells->data[j]; // The cell
-            if (cell->extname) {
-                psTrace(__func__, 3, "---> Cell is extension %s.\n", cell->extname);
-                if (! cell->pixels) {
-                    psTrace(__func__, 3, "---> NO PIXELS for extension %s\n", cell->extname);
-                }
-            }
-            psMetadataPrint(cell->values, 3);
+            if (cell->private) {
+                psTrace(__func__, 3, "---> Cell is extension %s.\n", cell->private->extname);
+                if (! cell->private->pixels) {
+                    psTrace(__func__, 3, "---> NO PIXELS for extension %s\n", cell->private->extname);
+                }
+            }
+            psMetadataPrint(cell->concepts, 3);
             psTrace(__func__, 3, "Readouts:\n");
             psArray *readouts = cell->readouts; // Array of readouts