Changeset 29449 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Oct 17, 2010, 9:10:35 AM (16 years ago)

Author:

eugene

Message:

generate a weight window based on the fwhms; pass around fwhm to ensure the window can be calculated; plug some leaks; better test outputs

File:

• branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionMatch.c (modified) (3 diffs)

branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionMatch.c

@@ -1202 +1202 @@
 
 bool pmSubtractionParamsScale(int *kernelSize, int *stampSize, psVector *widths,
-                              float fwhm1, float fwhm2, float scaleRef, float scaleMin, float scaleMax)
+                              float scaleRef, float scaleMin, float scaleMax)
 {
     PS_ASSERT_PTR_NON_NULL(kernelSize, false);
@@ -1208 +1208 @@
     PS_ASSERT_VECTOR_NON_NULL(widths, false);
     PS_ASSERT_VECTOR_TYPE(widths, PS_TYPE_F32, false);
-    PS_ASSERT_FLOAT_LARGER_THAN(fwhm1, 0.0, false);
-    PS_ASSERT_FLOAT_LARGER_THAN(fwhm2, 0.0, false);
     PS_ASSERT_FLOAT_LARGER_THAN(scaleRef, 0.0, false);
     PS_ASSERT_FLOAT_LARGER_THAN(scaleMin, 0.0, false);
@@ -1215 +1213 @@
     PS_ASSERT_FLOAT_LARGER_THAN(scaleMax, scaleMin, false);
 
+    float fwhm1;
+    float fwhm2;
+
+    pmSubtractionGetFWHMs(&fwhm1, &fwhm2);
+    psAssert(isfinite(fwhm1), "fwhm 1 not set");
+    psAssert(isfinite(fwhm2), "fwhm 2 not set");
+    
     // float diff = sqrtf(PS_SQR(PS_MAX(fwhm1, fwhm2)) - PS_SQR(PS_MIN(fwhm1, fwhm2))); // Difference
     float scale = PS_MAX(fwhm1, fwhm2) / scaleRef;      // Scaling factor
 
-    // XXX save these values in a static for later use
-    pmSubtractionSetFWHMs(fwhm1, fwhm2);
-
     if (isfinite(scaleMin) && scale < scaleMin) {
         scale = scaleMin;