Changeset 8246 for trunk/psModules/src/concepts/pmConceptsWrite.c

Timestamp:

Aug 8, 2006, 4:37:08 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psModules/src/concepts/pmConceptsWrite.c (modified) (4 diffs)

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -140 +140 @@
     switch (item->type) {
     case PS_DATA_STRING:
-        psTrace(__func__, 9, "Writing header %s: %s\n", keyword, item->data.V);
+        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.V);
         return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.V);
     case PS_DATA_S32:
-        psTrace(__func__, 9, "Writing header %s: %d\n", keyword, item->data.S32);
+        psTrace("psModules.concepts", 9, "Writing header %s: %d\n", keyword, item->data.S32);
         return psMetadataAddS32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.S32);
     case PS_DATA_F32:
-        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F32);
+        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F32);
         return psMetadataAddF32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F32);
     case PS_DATA_F64:
-        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F64);
+        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F64);
         return psMetadataAddF64(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F64);
     case PS_DATA_REGION: {
             psString region = psRegionToString(*(psRegion*)item->data.V);
-            psTrace(__func__, 9, "Writing header %s: %s\n", keyword, region);
+            psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, region);
             bool result = psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                            region);
@@ -252 +252 @@
             psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
             if (mdok && strlen(source) > 0) {
-                psTrace(__func__, 8, "%s is %s\n", nameSource, source);
+                psTrace("psModules.concepts", 8, "%s is %s\n", nameSource, source);
                 if (strcasecmp(source, "HEADER") == 0) {
                     if (cameraItem->type != PS_DATA_STRING) {
@@ -259 +259 @@
                         continue;
                     }
-                    psTrace(__func__, 8, "Writing %s to header %s\n", name, cameraItem->data.V);
+                    psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.V);
                     writeHeader(hdu, cameraItem->data.V, formatted);
                 } else if (strcasecmp(source, "VALUE") == 0) {
-                    psTrace(__func__, 8, "Checking %s against camera format.\n", name);
+                    psTrace("psModules.concepts", 8, "Checking %s against camera format.\n", name);
                     if (! compareConcepts(formatted, cameraItem)) {
                         psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
@@ -384 +384 @@
                 continue;
             }
-            psTrace(__func__, 3, "Writing %s to header %s\n", name, headerItem->data.V);
+            psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.V);
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
             psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);