Changeset 5462 for trunk/archive/scripts/src/phase2/pmConfig.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/pmConfig.c (modified) (3 diffs)

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

@@ -141 +141 @@
         psMetadataItem *traceItem = NULL; // Item from MD iteration
         while (traceItem = psMetadataGetAndIncrement(traceIter)) {
-            if (traceItem->type != PS_META_S32) {
+            if (traceItem->type != PS_DATA_S32) {
                 psLogMsg(__func__, PS_LOG_WARN, "The level for trace component %s is not of type S32 (%x)\n",
                          traceItem->name, traceItem->type);
@@ -181 +181 @@
         // Check to see if the rule works
         switch (ruleItem->type) {
-          case PS_META_STR:
+          case PS_DATA_STRING:
             psTrace(__func__, 8, "Matching %s: '%s' vs '%s'\n", ruleItem->name,
                     ruleItem->data.V, headerItem->data.V);
@@ -247 +247 @@
                 cameraItem->comment);
         psMetadata *camera = NULL;      // The camera metadata
-        if (cameraItem->type == PS_META_META) {
+        if (cameraItem->type == PS_DATA_METADATA) {
             camera = psMemIncrRefCounter(cameraItem->data.md);
-        } else if (cameraItem->type == PS_META_STR) {
+        } else if (cameraItem->type == PS_DATA_STRING) {
             psTrace(__func__, 5, "Reading camera configuration for %s...\n", cameraItem->name);
             int badLines = 0;           // Number of bad lines in reading camera configuration