Changeset 26036

Timestamp:

Nov 4, 2009, 4:57:20 PM (17 years ago)

Author:

Paul Price

Message:

Updating following API change to pmSubtractionMatch: including systematic error in images, distinct from systematic error in kernel.

Location:

trunk

Files:

• ippconfig/recipes/ppSub.config (modified) (1 diff)
• ppSub/src/ppSubMatchPSFs.c (modified) (2 diffs)

trunk/ippconfig/recipes/ppSub.config

@@ -12 +12 @@
 ITER            S32     1               # Number of rejection iterations
 REJ             F32     2.5             # Rejection level (std dev)
-SYS             F32     0.05            # Relative systematic error in kernel
+KERNEL.ERR      F32     0.05            # Relative systematic error in kernel
+SYS.ERR         F32     0.05            # Relative systematic error in images
 
 MASK.IN         STR     MASK.VALUE,CONV.BAD     # Mask value for input

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -130 +130 @@
     int iter = psMetadataLookupS32(NULL, recipe, "ITER"); // Rejection iterations
     float rej = psMetadataLookupF32(NULL, recipe, "REJ"); // Rejection threshold
-    float sys = psMetadataLookupF32(NULL, recipe, "SYS"); // Relative systematic error in kernel
+    float kernelErr = psMetadataLookupF32(NULL, recipe, "KERNEL.ERR"); // Relative systematic error in kernel
+    float sysErr = psMetadataLookupF32(NULL, recipe, "SYS.ERR"); // Relative systematic error in images
 
     float badFrac = psMetadataLookupF32(NULL, recipe, "BADFRAC"); // Maximum bad fraction
@@ -182 +183 @@
     if (kernelRO) {
         success = pmSubtractionMatchPrecalc(inConv, refConv, inRO, refRO, kernelRO->analysis,
-                                            stride, sys, maskVal, maskBad, maskPoor, poorFrac, badFrac);
+                                            stride, kernelErr, maskVal, maskBad, maskPoor, poorFrac, badFrac);
     } else {
         success = pmSubtractionMatch(inConv, refConv, inRO, refRO, footprint, stride, regionSize,
                                      spacing, threshold, sources, data->stamps, type, size, order,
                                      widths, orders, inner, ringsOrder, binning, penalty, optimum,
-                                     optWidths, optOrder, optThresh, iter, rej, sys, maskVal,
+                                     optWidths, optOrder, optThresh, iter, rej, sysErr, kernelErr, maskVal,
                                      maskBad, maskPoor, poorFrac, badFrac, subMode);
     }