Changeset 11749 for trunk/psModules/src/concepts/pmConceptsRead.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/pmConceptsRead.c (modified) (7 diffs)

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -53 +53 @@
 static bool conceptParse(pmConceptSpec *spec, // The concept specification
                          psMetadataItem *concept, // The concept to parse
+                         pmConceptSource source, // The concept source
                          psMetadata *cameraFormat, // The camera format
                          psMetadata *target, // The target
@@ -71 +72 @@
     psMetadataItem *parsed = NULL;  // The parsed concept
     if (spec->parse) {
-        parsed = spec->parse(concept, spec->blank, cameraFormat, fpa, chip, cell);
+        parsed = spec->parse(concept, spec->blank, source, cameraFormat, fpa, chip, cell);
     } else {
         parsed = parsePlain(concept, spec->blank);
@@ -144 +145 @@
                 psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
                 psFree(nameSource);
-                if (mdok && strlen(source) > 0 && strcasecmp(source, "VALUE") == 0) {
-                    if (!conceptParse(spec, conceptItem, cameraFormat, target, NULL, NULL, cell)) {
+                if (mdok && source && strlen(source) > 0 && strcasecmp(source, "VALUE") == 0) {
+                    if (!conceptParse(spec, conceptItem, PM_CONCEPT_SOURCE_CELLS,
+                                      cameraFormat, target, NULL, NULL, cell)) {
                         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from camera "
                                 "configuration\n", name);
@@ -158 +160 @@
             } else {
                 // Another type --- should be OK
-                if (!conceptParse(spec, conceptItem, cameraFormat, target, NULL, NULL, cell)) {
+                if (!conceptParse(spec, conceptItem, PM_CONCEPT_SOURCE_CELLS,
+                                  cameraFormat, target, NULL, NULL, cell)) {
                     psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from camera "
                             "configuration.\n", name);
@@ -241 +244 @@
             // Now we can parse this as we would ordinarily
         }
-        if (conceptItem && !conceptParse(spec, conceptItem, cameraFormat, target, fpa, chip, cell)) {
+        if (conceptItem && !conceptParse(spec, conceptItem, PM_CONCEPT_SOURCE_DEFAULTS,
+                                         cameraFormat, target, fpa, chip, cell)) {
             psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from DEFAULTS.\n", name);
             status = false;
@@ -340 +344 @@
         // This will also clean up the name
         if (headerItem) {
-            if (!conceptParse(spec, headerItem, cameraFormat, target, fpa, chip, cell)) {
+            if (!conceptParse(spec, headerItem, PM_CONCEPT_SOURCE_HEADER,
+                              cameraFormat, target, fpa, chip, cell)) {
                 psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from header.\n", name);
                 status = false;
@@ -459 +464 @@
 
                     // Now we have the result
-                    if (!conceptParse(spec, conceptItem, cameraFormat, target, fpa, chip, cell)) {
+                    if (!conceptParse(spec, conceptItem, PM_CONCEPT_SOURCE_DATABASE,
+                                      cameraFormat, target, fpa, chip, cell)) {
                         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to parse concept %s from database.\n",
                                 name);