Changeset 6804 for branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c

Timestamp:

Apr 5, 2006, 2:28:28 PM (20 years ago)

Author:

Paul Price

Message:

Reworking pmFPAAddSource for better code maintainance, and to implement PHU=FPA,EXT=NONE

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c (modified) (7 diffs)

branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c

@@ -5 +5 @@
 #include "pmFPA.h"
 #include "pmHDU.h"
-#include "pmHDUGetLowest.h"
+#include "pmHDUUtils.h"
 #include "pmConcepts.h"
 #include "pmConceptsRead.h"
@@ -31 +31 @@
         switch (item2->type) {
         case PS_TYPE_S32:
+            psTrace(__func__, 10, "Comparing %d and %d...\n", item1->data.S32, item2->data.S32);
             return (item1->data.S32 == item2->data.S32) ? true : false;
         case PS_TYPE_F32:
+            psTrace(__func__, 10, "Comparing %d and %d...\n", item1->data.S32, (int)item2->data.F32);
             return (item1->data.S32 == (int)item2->data.F32) ? true : false;
         case PS_TYPE_F64:
+            psTrace(__func__, 10, "Comparing %d and %d...\n", item1->data.S32, (int)item2->data.F64);
             return (item1->data.S32 == (int)item2->data.F64) ? true : false;
         default:
@@ -42 +45 @@
         switch (item2->type) {
         case PS_TYPE_S32:
+            psTrace(__func__, 10, "Comparing %f and %f...\n", item1->data.F32, (float)item2->data.S32);
             return (item1->data.F32 == (float)item2->data.S32) ? true : false;
         case PS_TYPE_F32:
+            psTrace(__func__, 10, "Comparing %f and %f...\n", item1->data.F32, item2->data.F32);
             return (item1->data.F32 == item2->data.F32) ? true : false;
         case PS_TYPE_F64:
+            psTrace(__func__, 10, "Comparing %f and %f...\n", item1->data.F32, (float)item2->data.F64);
             return (item1->data.F32 == (float)item2->data.F64) ? true : false;
         default:
@@ -53 +59 @@
         switch (item2->type) {
         case PS_TYPE_S32:
+            psTrace(__func__, 10, "Comparing %f and %f...\n", item1->data.F32, (double)item2->data.S32);
             return (item1->data.F64 == (double)item2->data.S32) ? true : false;
         case PS_TYPE_F32:
+            psTrace(__func__, 10, "Comparing %f and %f...\n", item1->data.F32, (double)item2->data.F32);
             return (item1->data.F64 == (double)item2->data.F32) ? true : false;
         case PS_TYPE_F64:
+            psTrace(__func__, 10, "Comparing %f and %f...\n", item1->data.F32, item2->data.F64);
             return (item1->data.F64 == item2->data.F64) ? true : false;
         default:
@@ -66 +75 @@
             return false;
         }
+        psTrace(__func__, 10, "Comparing '%s' and '%s'\n", item1->data.V, item2->data.V);
         return (strcasecmp(item1->data.V, item2->data.V) == 0) ? true : false;
     default:
@@ -230 +240 @@
 }
 
-// XXX: Needs the .DEPEND stuff
 bool pmConceptsWriteToDefaults(psMetadata *specs, // The concept specifications
                                pmFPA *fpa, // The FPA
@@ -283 +292 @@
                 if (! compareConcepts(defaultItem, formatted)) {
                     psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by the DEFAULTS in the camera "
-                             "format, but the values don't match.\n");
+                             "format, but the values don't match.\n", name);
                 }
                 psFree(formatted);