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

Timestamp:

Feb 12, 2007, 12:22:15 PM (19 years ago)

Author:

Paul Price

Message:

Adding fix to bug 853: when CELL.BIASSEC or CELL.TRIMSEC are specified by value in the CELLS part of the camera format, then they need to be updated by the binning. Added pmConceptsUpdate, which is run after concepts are read, and seaches for concepts to update (e.g., dependent on other concepts, which may not be available at read time --- just like CELL.TRIMSEC and CELL.XBIN/CELL.YBIN). To use this, changed the functions that parse/format standard concepts to receive the source of the concept. CELL.TRIMSEC and CELL.BIASSEC are updated for the binning if CELL.TRIMSEC.UPDATE or CELL.BIASSEC.UPDATE are set. Tested this quickly, and it seems to work.

File:

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

trunk/psModules/src/concepts/pmConceptsWrite.c

@@ -106 +106 @@
 static psMetadataItem *conceptFormat(const pmConceptSpec *spec, // The concept specification
                                      const psMetadataItem *concept, // The concept to parse
+                                     pmConceptSource source, // The concept source
                                      const psMetadata *cameraFormat, // The camera format
                                      const pmFPA *fpa, // The FPA
@@ -118 +119 @@
         psMetadataItem *formatted = NULL;  // The formatted concept
         if (spec->format) {
-            formatted = spec->format(concept, cameraFormat, fpa, chip, cell);
+            formatted = spec->format(concept, source, cameraFormat, fpa, chip, cell);
         } else if (strcmp(concept->name, spec->blank->name) != 0) {
             // Adjust so that the name is correct
@@ -251 +252 @@
             // Grab the concept
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The concept
-            // Formatted version
-            psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, NULL, NULL, cell);
-            if (!formatted) {
-                continue;
-            }
+
             psString nameSource = NULL; // String with the concept name and ".SOURCE" added
             psStringAppend(&nameSource, "%s.SOURCE", name);
@@ -268 +265 @@
                         continue;
                     }
+
+                    // Formatted version
+                    psMetadataItem *formatted = conceptFormat(spec, conceptItem, PM_CONCEPT_SOURCE_HEADER,
+                                                              cameraFormat, NULL, NULL, cell);
+                    if (!formatted) {
+                        continue;
+                    }
+
                     psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.str);
                     writeHeader(hdu, cameraItem->data.V, formatted);
+                    psFree(formatted);
                 } else if (strcasecmp(source, "VALUE") == 0) {
+                    // Formatted version
+                    psMetadataItem *formatted = conceptFormat(spec, conceptItem, PM_CONCEPT_SOURCE_CELLS,
+                                                              cameraFormat, NULL, NULL, cell);
+                    if (!formatted) {
+                        continue;
+                    }
+
                     psTrace("psModules.concepts", 8, "Checking %s against camera format.\n", name);
                     if (! compareConcepts(formatted, cameraItem)) {
@@ -276 +289 @@
                                  "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 "
                              "write\n", nameSource);
                 }
-            } else if (! compareConcepts(formatted, cameraItem)) {
+            } else {
                 // Assume it's specified by value
-                psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
-                         "format, but the values don't match.\n", name);
-            }
-            psFree(formatted);
+                psMetadataItem *formatted = conceptFormat(spec, conceptItem, PM_CONCEPT_SOURCE_CELLS,
+                                                          cameraFormat, NULL, NULL, cell);
+                if (!formatted) {
+                    continue;
+                }
+
+                if (! compareConcepts(formatted, cameraItem)) {
+                    psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
+                             "format, but the values don't match.\n", name);
+                }
+                psFree(formatted);
+            }
             psFree(nameSource);
         }
@@ -346 +368 @@
             }
             conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
-            psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
+            psMetadataItem *formatted = conceptFormat(spec, conceptItem, PM_CONCEPT_SOURCE_DEFAULTS,
+                                                      cameraFormat, fpa, chip, cell);
             if (!formatted) {
                 continue;
@@ -394 +417 @@
             psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.str);
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
-            psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
+            psMetadataItem *formatted = conceptFormat(spec, conceptItem, PM_CONCEPT_SOURCE_HEADER,
+                                                      cameraFormat, fpa, chip, cell);
             if (!formatted) {
                 continue;
@@ -446 +470 @@
 
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
-            psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
+            psMetadataItem *formatted = conceptFormat(spec, conceptItem, PM_CONCEPT_SOURCE_DATABASE,
+                                                      cameraFormat, fpa, chip, cell);
             if (!formatted) {
                 continue;