Changeset 30440

Timestamp:

Jan 31, 2011, 2:15:58 PM (15 years ago)

Author:

eugene

Message:

pmSubtractionParamScaleOptions replaces pmSubtractionParamsScale

File:

• branches/eam_branches/ipp-20101205/ppStack/src/ppStackMatch.c (modified) (1 diff)

branches/eam_branches/ipp-20101205/ppStack/src/ppStackMatch.c

@@ -316 +316 @@
                 // Scale the input parameters
                 psVector *widthsCopy = psVectorCopy(NULL, widths, PS_TYPE_F32); // Copy of kernel widths
-                if (scale && !pmSubtractionParamsScale(&size, &footprint, widthsCopy, scaleRef, scaleMin, scaleMax)) {
-                    psError(psErrorCodeLast(), false, "Unable to scale kernel parameters");
-                    psFree(fake);
-                    psFree(optWidths);
-                    psFree(conv);
-                    psFree(widthsCopy);
-                    if (threads > 0) {
-                        pmSubtractionThreadsFinalize();
-                    }
-                    return false;
-                }
+
+                pmSubtractionParamScaleOptions(scale, scaleRef, scaleMin, scaleMax);
+
+                // XXX EAM : the kernel scaling process has changed: the scale is now set
+                // inside pmSubtractionMatch after the normalization window is measured
+
+                // if (scale && !pmSubtractionParamsScale(&size, &footprint, widthsCopy, scaleRef, scaleMin, scaleMax)) {
+                //     psError(psErrorCodeLast(), false, "Unable to scale kernel parameters");
+                //     psFree(fake);
+                //     psFree(optWidths);
+                //     psFree(conv);
+                //     psFree(widthsCopy);
+                //     if (threads > 0) {
+                //         pmSubtractionThreadsFinalize();
+                //     }
+                //     return false;
+                // }
 
                 if (!pmSubtractionMatch(NULL, conv, fake, readout, footprint, stride, regionSize, spacing,