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

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

@@ -15 +15 @@
             psError(PS_ERR_IO, true, "Couldn't find %s in the metadata.\n");
         }
-    } else if (item->type != PS_META_META) {
+    } else if (item->type != PS_DATA_METADATA) {
         // The value at the key isn't metadata
         if (status) {
             *status = false;
         } else {
-            psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_META_META, as expected.\n");
+            psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_DATA_METADATA, as expected.\n");
         }
         value = NULL;
@@ -45 +45 @@
             psError(PS_ERR_IO, true, "Couldn't find %s in the metadata.\n");
         }
-    } else if (item->type != PS_META_STR) {
+    } else if (item->type != PS_DATA_STRING) {
         // The value at the key isn't of the desired type
         if (status) {
             *status = false;
         } else {
-            psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_META_STR, as expected.\n");
+            psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_DATA_STRING, as expected.\n");
         }
         value = NULL;
@@ -79 +79 @@
         printf(": ");
         switch (item->type) {
-          case PS_META_STR:
+          case PS_DATA_STRING:
             printf("%s", item->data.V);
             break;
-          case PS_META_BOOL:
+          case PS_DATA_BOOL:
             if (item->data.B) {
                 printf("True");
@@ -89 +89 @@
             }
             break;
-          case PS_META_S32:
+          case PS_DATA_S32:
             printf("%d", item->data.S32);
             break;
-          case PS_META_F32:
+          case PS_DATA_F32:
             printf("%f", item->data.F32);
             break;
-          case PS_META_F64:
+          case PS_DATA_F64:
             printf("%f", item->data.F64);
             break;
-          case PS_META_META:
+          case PS_DATA_METADATA:
             printf("\n");
             psMetadataPrint(item->data.V, level + 1);
@@ -200 +200 @@
     switch(item->type) {
         // Only doing a representative set of types
-      case PS_META_S32:
+      case PS_DATA_S32:
         newItem = psMetadataItemAlloc(item->name, item->type, item->comment, atoi(argv[argnum]));
         psArgumentRemove(argnum, argc, argv);
         break;
-      case PS_META_F32:
+      case PS_DATA_F32:
         newItem = psMetadataItemAlloc(item->name, item->type, item->comment, atof(argv[argnum]));
         psArgumentRemove(argnum, argc, argv);
         break;
-      case PS_META_BOOL:
+      case PS_DATA_BOOL:
         // Turn option on; no optional argument to remove
         newItem = psMetadataItemAlloc(item->name, item->type, item->comment, true);
         break;
         // XXX: Include the other numerical types
-      case PS_META_STR:
+      case PS_DATA_STRING:
         {
             //psString string = psStringCopy(argv[argnum]);     // Get the argument into PS memory management
@@ -250 +250 @@
         if (argItem) {
             psArgumentRemove(i, argc, argv); // Remove the switch
-            if (argItem->type != PS_META_MULTI) {
-                if (argItem->type != PS_META_BOOL && *argc < i + 1) {
+            if (argItem->type != PS_DATA_METADATA_MULTI) {
+                if (argItem->type != PS_DATA_BOOL && *argc < i + 1) {
                     psError(PS_ERR_IO, true, "Required argument for %s is missing.\n", argItem->name);
                     // XXX: Cleanup before returning
@@ -318 +318 @@
         switch (oldItem->type) {
             // Only doing a representative set of types
-          case PS_META_S32:
+          case PS_DATA_S32:
             oldItem->data.S32 = newItem->data.S32;
             break;
-          case PS_META_F32:
+          case PS_DATA_F32:
             oldItem->data.F32 = newItem->data.F32;
             break;
-          case PS_META_BOOL:
+          case PS_DATA_BOOL:
             oldItem->data.B = newItem->data.B;
             break;
             // XXX: Include the other numerical types
-          case PS_META_STR:
+          case PS_DATA_STRING:
             psFree(oldItem->data.V);
             oldItem->data.V = psMemIncrRefCounter(newItem->data.V);
             break;
-          case PS_META_MULTI:
+          case PS_DATA_METADATA_MULTI:
             {
                 psList *newMulti = psMemIncrRefCounter(newItem->data.V);        // The new list of MULTI
@@ -347 +347 @@
                     switch (oldMultiItem->type) {
                         // Only doing a representative set of types
-                      case PS_META_S32:
+                      case PS_DATA_S32:
                         oldItem->data.S32 = newItem->data.S32;
                         break;
-                      case PS_META_F32:
+                      case PS_DATA_F32:
                         oldItem->data.F32 = newItem->data.F32;
                         break;
                         // XXX: Include the other numerical types
-                      case PS_META_STR:
+                      case PS_DATA_STRING:
                         psFree(oldItem->data.V);
                         oldItem->data.V = psMemIncrRefCounter(newItem->data.V);
@@ -385 +385 @@
     switch (arg->type) {
         // Only doing a representative set of types
-      case PS_META_S32:
+      case PS_DATA_S32:
         return arg->data.S32 >= 0 ? (int)log10f((float)arg->data.S32) + 1 :
             (int)log10f(-(float)arg->data.S32) + 2;
         // XXX: Other numerical types
-      case PS_META_F32:
+      case PS_DATA_F32:
         return arg->data.F32 >= 0 ? 12 : 13; // -d.dddddde?dd
-      case PS_META_F64:
+      case PS_DATA_F64:
         return arg->data.F64 >= 0 ? 12 : 13; // -d.dddddde?dd
-      case PS_META_BOOL:
+      case PS_DATA_BOOL:
         return arg->data.B ? 4 : 5;
-      case PS_META_STR:
+      case PS_DATA_STRING:
         return strlen(arg->data.V);
       default:
@@ -450 +450 @@
         switch (argItem->type) {
             // Only doing a representative set of types
-          case PS_META_S32:
+          case PS_DATA_S32:
             printf("%d", argItem->data.S32);
             break;
             // XXX: Other numerical types
-          case PS_META_F32:
+          case PS_DATA_F32:
             printf("%.6e", argItem->data.F32);
             break;
-          case PS_META_F64:
+          case PS_DATA_F64:
             printf("%.6e", argItem->data.F64);
             break;
-          case PS_META_BOOL:
+          case PS_DATA_BOOL:
             if (argItem->data.B) {
                 printf("TRUE");
@@ -467 +467 @@
             }
             break;
-          case PS_META_STR:
+          case PS_DATA_STRING:
             printf("%s", argItem->data.V);
             break;