Changeset 31086 for branches/eam_branches/ipp-20110213/ppImage/src/ppImageOptions.c

Timestamp:

Mar 30, 2011, 9:39:01 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20110213/ppImage/src

Files:

• . (modified) (1 prop)
• ppImageOptions.c (modified) (3 diffs)

branches/eam_branches/ipp-20110213/ppImage/src/ppImageOptions.c

@@ -126 +126 @@
         exit(EXIT_FAILURE);
     }
-
+    psMetadata *format = config->format;
+    
     // Non-linearity recipe options
     if (psMetadataLookupBool(NULL, recipe, "NONLIN")) {
@@ -237 +238 @@
     options->doFringe = psMetadataLookupBool(NULL, recipe, "FRINGE");
     options->doShutter = psMetadataLookupBool(NULL, recipe, "SHUTTER");
+
+    // PATTERN.ROW is selected by the recipe.  If it is selected, we search for the table
+    // PATTERN.ROW.SUBSET.  If this is found in our format file, we use that version;
+    // otherwise, we use the table provided in the recipe file "ppImage.config".  Within that
+    // table, we select the entry that matches our CHIP.NAME.  This will be either a boolean or
+    // a string of bits.  If it is a boolean, it specified whether or not to correct the entire
+    // chip; if it is a string, the bits specify which cells to correct (sequence is order of
+    // CELLS in the format:CHIPS metadata table)
+
+    // We also check the chip header for the boolean 'PTRN_ROW' : if this is true, we have
+    // already applied this correct to this data, so we simply skip the correction for this
+    // chip.
+
     options->doPatternRow = psMetadataLookupBool(NULL, recipe, "PATTERN.ROW");
     options->doPatternCell = psMetadataLookupBool(NULL, recipe, "PATTERN.CELL");
+
     options->doMaskStats = psMetadataLookupBool(NULL, recipe, "MASK.STATS");
     options->addNoise = psMetadataLookupBool(NULL, recipe, "ADDNOISE");
@@ -344 +359 @@
 
     // Pattern correction
-    options->patternRowOrder = psMetadataLookupS32(NULL, recipe, "PATTERN.ROW.ORDER");
-    options->patternRowIter = psMetadataLookupS32(NULL, recipe, "PATTERN.ROW.ITER");
-    options->patternRowRej = psMetadataLookupF32(NULL, recipe, "PATTERN.ROW.REJ");
-    options->patternRowThresh = psMetadataLookupF32(NULL, recipe, "PATTERN.ROW.THRESH");
-    options->patternRowMean = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.ROW.MEAN"));
-    options->patternRowStdev = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.ROW.STDEV"));
-    options->patternCellBG = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.CELL.BG"));
-    options->patternCellMean = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.CELL.MEAN"));
+    if (psMetadataLookup(format, "PATTERN.ROW.ORDER")) {
+      options->patternRowOrder = psMetadataLookupS32(NULL, format, "PATTERN.ROW.ORDER");
+    }
+    else {
+      options->patternRowOrder = psMetadataLookupS32(NULL, recipe, "PATTERN.ROW.ORDER");
+    }
+    if (psMetadataLookup(format, "PATTERN.ROW.ITER")) {
+      options->patternRowIter = psMetadataLookupS32(NULL, format, "PATTERN.ROW.ITER");
+    }
+    else {
+      options->patternRowIter = psMetadataLookupS32(NULL, recipe, "PATTERN.ROW.ITER");
+    }
+    if (psMetadataLookup(format, "PATTERN.ROW.REJ")) {
+      options->patternRowRej = psMetadataLookupF32(NULL, format, "PATTERN.ROW.REJ");
+    }
+    else {
+      options->patternRowRej = psMetadataLookupF32(NULL, recipe, "PATTERN.ROW.REJ");
+    }
+    if (psMetadataLookup(format, "PATTERN.ROW.THRESH")) {
+      options->patternRowThresh = psMetadataLookupF32(NULL, format, "PATTERN.ROW.THRESH");
+    }
+    else {
+      options->patternRowThresh = psMetadataLookupF32(NULL, recipe, "PATTERN.ROW.THRESH");
+    }
+    if (psMetadataLookup(format, "PATTERN.ROW.MEAN")) {
+      options->patternRowMean = psStatsOptionFromString(psMetadataLookupStr(NULL, format, "PATTERN.ROW.MEAN"));
+    }
+    else {
+      options->patternRowMean = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.ROW.MEAN"));
+    }
+    if (psMetadataLookup(format, "PATTERN.ROW.STDEV")) {
+      options->patternRowStdev = psStatsOptionFromString(psMetadataLookupStr(NULL, format, "PATTERN.ROW.STDEV"));
+    }
+    else {
+      options->patternRowStdev = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.ROW.STDEV"));
+    }
+    if (psMetadataLookup(format, "PATTERN.CELL.BG")) {
+      options->patternCellBG = psStatsOptionFromString(psMetadataLookupStr(NULL, format, "PATTERN.CELL.BG"));
+    }
+    else {
+      options->patternCellBG = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.CELL.BG"));
+    }
+    if (psMetadataLookup(format, "PATTERN.CELL.MEAN")) {
+      options->patternCellMean = psStatsOptionFromString(psMetadataLookupStr(NULL, format, "PATTERN.CELL.MEAN"));
+    }
+    else {
+      options->patternCellMean = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe, "PATTERN.CELL.MEAN"));
+    }
+
 
     // Remnance options