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

Timestamp:

Mar 22, 2007, 5:09:53 PM (19 years ago)

Author:

Paul Price

Message:

When we went to process TC3 images, we found that our camera formats
didn't handle its case (PHU=CHIP, EXT=CELL) properly. In order to
accomodate it, I've reworked the camera formats (including adding a
source to an FPA, and generating mosaic camera configurations). Now,
the particular format of the camera format file is *very* dependent
upon the FITS file:

Case PHU EXTENSIONS Description

1. FPA CHIP CONTENTS(METADATA) has a list of extensions, each with a chip type.

CHIPS(METADATA) has a list of chip types, each with cell:type

2. FPA CELL CONTENTS(METADATA) has a list of extensions, each with chip:cell:type

No need for CHIPS.

3. FPA NONE CONTENTS(STRING) has a list of extensions, chip:cell:type

No need for CHIPS

4. CHIP CELL CONTENTS(METADATA) is a menu, each with a chip type

CHIPS(METADATA) has a list of chip types(METADATA), containg a list of
extensions.

5. CHIP NONE CONTENTS(METADATA) is a menu, each with a chip type

CHIPS(METADATA) has a list of chip types(STRING) with cell:type

6. CELL NONE CONTENTS(METADATA) is a menu, each with a cell type.

No need for CHIPS.

Debugged and plugged memory leaks for this fix. Now able to
successfully read TC3 and Megacam (all 3 formats). Can't run ppImage
with PPIMAGE_N on file with PHU=CHIP because it's trying to write out
a PHU (at the FPA level) before it reads any of the input data. This
behaviour exists in a previous version (IPP 1.0; in fact, the current
fix deals with it a bit better --- error instead of SEGV), so it
should be safe to use this now.

File:

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

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -57 +57 @@
         while ((cItem = psListGetAndIncrement(cIter))) {
             if (cItem->type != PS_DATA_STRING) {
-                psLogMsg(__func__, PS_LOG_WARN, "psMetadataItem from list is of type %x instead of "
+                psWarning("psMetadataItem from list is of type %x instead of "
                          "%x (PS_DATA_STRING) --- can't interpret.\n", cItem->type, PS_DATA_STRING);
                 psFree(cIter);
@@ -178 +178 @@
         }
     default:
-        psLogMsg(__func__, PS_LOG_WARN, "Type of %s is not suitable for a FITS header --- not added.\n",
+        psWarning("Type of %s is not suitable for a FITS header --- not added.\n",
                  item->name);
         return false;
@@ -261 +261 @@
                 if (strcasecmp(source, "HEADER") == 0) {
                     if (cameraItem->type != PS_DATA_STRING) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by header, but is not "
+                        psWarning("Concept %s is specified by header, but is not "
                                  "of type STR --- ignored.\n", conceptItem->name);
                         continue;
@@ -286 +286 @@
                     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 "
+                        psWarning("Concept %s is specified by value in the camera "
                                  "format, but the values don't match.\n", name);
                     }
                     psFree(formatted);
                 } else {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept source %s isn't HEADER or VALUE --- can't "
+                    psWarning("Concept source %s isn't HEADER or VALUE --- can't "
                              "write\n", nameSource);
                 }
@@ -303 +303 @@
 
                 if (! compareConcepts(formatted, cameraItem)) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
+                    psWarning("Concept %s is specified by value in the camera "
                              "format, but the values don't match.\n", name);
                 }
@@ -347 +347 @@
                 psString dependKey = psMetadataLookupStr(&mdok, defaults, dependName); // The keyword
                 if (!mdok || !dependKey || strlen(dependKey) == 0) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Can't find %s in the DEFAULTS for %s --- ignored.\n",
+                    psWarning("Can't find %s in the DEFAULTS for %s --- ignored.\n",
                              dependName, name);
                     psFree(dependName);
@@ -354 +354 @@
                 psString dependValue = psMetadataLookupStr(&mdok, concepts, dependKey); // The value
                 if (!mdok || !dependValue || strlen(dependValue) == 0) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept %s specified by %s isn't of type STR -- "
+                    psWarning("Concept %s specified by %s isn't of type STR -- "
                              "ignored.\n", dependKey, dependName);
                     psFree(dependName);
@@ -360 +360 @@
                 }
                 // Get the actual item of interest, and correct the name to match the concept name
-                defaultItem = psMetadataLookup(defaultItem->data.md, dependValue);
-                if (!defaultItem) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Concept dependency name %s is not found "
-                             "in concept table for %s -- ignored.\n", dependValue, dependName);
+                defaultItem = psMetadataLookup(defaultItem->data.md, dependValue);
+                if (!defaultItem) {
+                    psWarning("Concept dependency name %s is not found "
+                             "in concept table for %s -- ignored.\n", dependValue, dependName);
                     psFree(dependName);
                     continue;
-                }
+                }
                 defaultItem = psMetadataItemCopy(defaultItem);
                 psFree(dependName);
@@ -381 +381 @@
             }
             if (! compareConcepts(formatted, defaultItem)) {
-                psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by the DEFAULTS in the camera "
+                psWarning("Concept %s is specified by the DEFAULTS in the camera "
                          "format, but the values don't match.\n", name);
             }
@@ -418 +418 @@
         if (headerItem) {
             if (headerItem->type != PS_DATA_STRING) {
-                psLogMsg(__func__, PS_LOG_WARN, "TRANSLATION keyword for concept %s isn't of type STR ---"
+                psWarning("TRANSLATION keyword for concept %s isn't of type STR ---"
                          " ignored.", name);
                 continue;
@@ -471 +471 @@
         if (dbItem) {
             if (dbItem->type != PS_DATA_METADATA) {
-                psLogMsg(__func__, PS_LOG_WARN, "DATABASE keyword for concept %s isn't of type METADATA "
+                psWarning("DATABASE keyword for concept %s isn't of type METADATA "
                          "--- ignored.\n", name);
                 continue;
@@ -508 +508 @@
                         char *dependName = psListGetAndIncrement(valuesIter); // Name for the value
                         if (!strlen(column) || !strlen(name)) {
-                            psLogMsg(__func__, PS_LOG_WARN, "One of the columns or value names for %s is "
+                            psWarning("One of the columns or value names for %s is "
                                      " empty --- ignored.\n", name);
                         } else {
@@ -543 +543 @@
                     // Note that we use limit=2 in order to test if there are multiple rows returned
                     if (! dbResult || dbResult->n == 0) {
-                        psLogMsg(__func__, PS_LOG_WARN, "Unable to find any rows in DB for %s --- "
+                        psWarning("Unable to find any rows in DB for %s --- "
                                  "ignored\n", name);
                         return false;
                     } else {
                         if (dbResult->n > 1) {
-                            psLogMsg(__func__, PS_LOG_WARN, "Multiple rows returned in DB lookup for %s "
+                            psWarning("Multiple rows returned in DB lookup for %s "
                                      "--- ignored.\n", name);
                         }