Changeset 42382 for trunk/ppImage/src/ppImageOptions.c

Timestamp:

Feb 8, 2023, 11:57:40 AM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. add code for PatternDeadCells, fix organization of DetrendPattern, handle psphotModelBackground failure

Location:

trunk/ppImage

Files:

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

trunk/ppImage/src/ppImageOptions.c

@@ -226 +226 @@
         }
 
+        bool mdok;
         int boxcar = psMetadataLookupS32(NULL, recipe, "OVERSCAN.BOXCAR");
         float gauss = psMetadataLookupF32(NULL, recipe, "OVERSCAN.GAUSS");
+        float minValid = psMetadataLookupF32(&mdok, recipe, "OVERSCAN.MIN.VALID");
+        if (!mdok) { minValid = 0.0; }
+
+        float maxValid = psMetadataLookupF32(&mdok, recipe, "OVERSCAN.MAX.VALID");
+        if (!mdok) { maxValid = (float) 0x10000; }
 
         // Fill in the options
@@ -235 +241 @@
         options->overscan->constant = psMetadataLookupBool(NULL, recipe, "OVERSCAN.CONSTANT");
         options->overscan->value = psMetadataLookupF32(NULL, recipe, "OVERSCAN.VALUE");
+        options->overscan->minValid = minValid;
+        options->overscan->maxValid = maxValid;
+        options->overscan->maskVal  = 0x0001;
 
         psFree(overscanStats);
@@ -290 +299 @@
     options->doPatternCell = psMetadataLookupBool(NULL, recipe, "PATTERN.CELL");
     options->doPatternContinuity = psMetadataLookupBool(NULL, recipe, "PATTERN.CONTINUITY");
+    options->doPatternDeadCells = psMetadataLookupBool(NULL, recipe, "PATTERN.DEAD.CELLS");
 
     options->doMaskStats = psMetadataLookupBool(NULL, recipe, "MASK.STATS");