Changeset 25833 for branches/pap/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Oct 13, 2009, 7:54:28 PM (17 years ago)

Author:

Paul Price

Message:

Attempting to fix dual convolution. Starting off by consolidating and making code plain to do forwards convolution. Adding some small optimisations: it's slightly quicker to generate the solvedKernel using the pre-computed full image kernel, but for convolving stamps, faster to use the separate x and y kernels.

File:

• branches/pap/psModules/src/imcombine/pmSubtractionKernels.c (modified) (3 diffs)

branches/pap/psModules/src/imcombine/pmSubtractionKernels.c

@@ -140 +140 @@
         for (int uOrder = 0; uOrder <= orders->data.S32[i]; uOrder++) {
             for (int vOrder = 0; vOrder <= orders->data.S32[i] - uOrder; vOrder++, index++) {
-                psArray *preCalc = psArrayAlloc(2); // Array to hold precalculated values
+                psArray *preCalc = psArrayAlloc(3); // Array to hold precalculated values
                 psVector *xKernel = preCalc->data[0] = subtractionKernelISIS(sigma, uOrder, size); // x Kernel
                 psVector *yKernel = preCalc->data[1] = subtractionKernelISIS(sigma, vOrder, size); // y Kernel
+                psKernel *kernel = preCalc->data[2] = psKernelAlloc(-size, size, -size, size);      // Kernel
 
                 // Calculate moments
@@ -149 +150 @@
                     for (int u = -size, x = 0; u <= size; u++, x++) {
                         double value = xKernel->data.F32[x] * yKernel->data.F32[y]; // Value of kernel
+                        kernel->kernel[v][u] = value;
                         moment += value * (PS_SQR(u) + PS_SQR(v));
                     }
@@ -164 +166 @@
                     psBinaryOp(xKernel, xKernel, "*", psScalarAlloc(sum, PS_TYPE_F32));
                     psBinaryOp(yKernel, yKernel, "*", psScalarAlloc(sum, PS_TYPE_F32));
+                    psBinaryOp(kernel->image, kernel->image, "*", psScalarAlloc(PS_SQR(sum), PS_TYPE_F32));
+                    kernel->kernel[0][0] -= 1.0;
                     moment *= PS_SQR(sum);
                 }