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

Timestamp:

Nov 2, 2005, 3:30:32 PM (21 years ago)

Author:

Paul Price

Message:

Working with release 8. Overscan, bias, flat-fielding all working.

File:

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

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

@@ -37 +37 @@
     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);
+        if (item->type == PS_DATA_METADATA_MULTI || item->type == PS_DATA_METADATA) {
+            psLogMsg(__func__, PS_LOG_WARN, "PS_DATA_METADATA_MULTI and PS_DATA_METADATA are not supported "
+                     "in a cell definition --- %s ignored.\n", item->name);
             continue;
         }
@@ -89 +89 @@
                 pmChip *chip = pmChipAlloc(fpa, extName); // The chip
                 chip->data = pmPixelDataAlloc(extName); // Prepare chip to receive FITS data
-                if (contentItem->type != PS_META_STR) {
+                if (contentItem->type != PS_DATA_STRING) {
                     psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
                              contentItem->type);
@@ -117 +117 @@
                 psTrace(__func__, 1, "Getting %s....\n", extName);
 
-                if (contentItem->type != PS_META_STR) {
+                if (contentItem->type != PS_DATA_STRING) {
                     psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
                              contentItem->type);
@@ -136 +136 @@
                     if (! chipItem) {
                         chip = pmChipAlloc(fpa, chipName);
-                        psMetadataAdd(chips, PS_LIST_TAIL, chipName, PS_META_CHIP, "", chip);
+                        psMetadataAdd(chips, PS_LIST_TAIL, chipName, PS_DATA_UNKNOWN, "", chip);
                     } else {
                         chip = psMemIncrRefCounter(chipItem->data.V);
@@ -161 +161 @@
                 psString chipName = contentItem->name; // The name of the chip
 
-                if (contentItem->type != PS_META_STR) {
+                if (contentItem->type != PS_DATA_STRING) {
                     psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
                              contentItem->type);
@@ -234 +234 @@
                 psString extName = contentItem->name; // The name of the extension
                 // Content is a cell type
-                if (contentItem->type != PS_META_STR) {
+                if (contentItem->type != PS_DATA_STRING) {
                     psLogMsg(__func__, PS_LOG_WARN,
                              "CONTENT metadata for extension %s is not of type string, but %x --- ignored\n",