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

trunk/psModules/src/concepts/pmConcepts.c

@@ -13 +13 @@
 #include "pmConceptsWrite.h"
 #include "pmConceptsStandard.h"
+#include "pmConceptsUpdate.h"
 
 static bool conceptsInitialised = false;// Have concepts been read?
@@ -222 +223 @@
     #endif
 
+    pmConceptsUpdate(fpa, chip, cell);
+
     return success;
 }
@@ -486 +489 @@
         {
             psMetadataItem *fpaFilterid = psMetadataItemAllocStr("FPA.FILTERID",
-                                          "Filter used (parsed, abstract name) ", "");
+                                                                 "Filter used (parsed, abstract name) ", "");
             pmConceptRegister(fpaFilterid, (pmConceptParseFunc)p_pmConceptParse_FPA_FILTER,
                               (pmConceptFormatFunc)p_pmConceptFormat_FPA_FILTER, PM_FPA_LEVEL_FPA);