Changeset 6452 for trunk/pois/src/poisExtractKernel.c

Timestamp:

Feb 17, 2006, 5:11:30 PM (20 years ago)

Author:

Paul Price

Message:

Updating to work with pslib rel10 --- needed to fix polynomial allocation and image subregions

File:

• trunk/pois/src/poisExtractKernel.c (modified) (3 diffs)

trunk/pois/src/poisExtractKernel.c

@@ -6 +6 @@
 /* Create a kernel image from the solution vector */
 psImage *poisExtractKernel(const psVector *solution, // Vector containing the kernel elements
-                           const psArray *kernelParams, // The kernel parameters
-                           float x,     // The relative (-1 to 1) x position for which to get the kernel
-                           float y,     // The relative (-1 to 1) y position for which to get the kernel
-                           const poisConfig *config // Configuration
+                           const psArray *kernelParams, // The kernel parameters
+                           float x,     // The relative (-1 to 1) x position for which to get the kernel
+                           float y,     // The relative (-1 to 1) y position for which to get the kernel
+                           const poisConfig *config // Configuration
     )
 {
@@ -18 +18 @@
     assert(y >= -1.0 && y <= 1.0);
 
-    int xKernel = config->xKernel;      // Half-size of kernel in x
-    int yKernel = config->yKernel;      // Half-size of kernel in y
-    float kernelSum = 0.0;              // Sum of the kernel
+    int xKernel = config->xKernel;      // Half-size of kernel in x
+    int yKernel = config->yKernel;      // Half-size of kernel in y
+    float kernelSum = 0.0;              // Sum of the kernel
 
     /* Allocate the image */
     psImage *image = psImageAlloc(2*xKernel + 1, 2*yKernel + 1, PS_TYPE_F32); // The kernel image
     for (int j = 0; j < (2*yKernel + 1); j++) {
-        for (int i = 0; i < (2*xKernel + 1); i++) {
-            image->data.F32[j][i] = 0.0;
-        }
+        for (int i = 0; i < (2*xKernel + 1); i++) {
+            image->data.F32[j][i] = 0.0;
+        }
     }
 
-    psPolynomial2D *poly = psPolynomial2DAlloc(config->spatialOrder + 1, config->spatialOrder + 1,
-                                               PS_POLYNOMIAL_ORD); // Polynomial for evaluation
+    psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, config->spatialOrder + 1,
+                                               config->spatialOrder + 1); // Polynomial for evaluation
     for (int j = 0; j < config->spatialOrder + 1; j++) {
-        for (int i = 0; i < config->spatialOrder + 1; i++) {
-            poly->coeff[j][i] = 1.0;
-            poly->mask[j][i] = 1;       // Mask all coefficients; unmask to evaluate
-        }
+        for (int i = 0; i < config->spatialOrder + 1; i++) {
+            poly->coeff[j][i] = 1.0;
+            poly->mask[j][i] = 1;       // Mask all coefficients; unmask to evaluate
+        }
     }
 
@@ -42 +42 @@
     /* Iterate over the kernel parameters */
     for (int k = 0; k < kernelParams->n; k++) {
-        poisKernelBasis *kernel = kernelParams->data[k]; // The kernel basis function
+        poisKernelBasis *kernel = kernelParams->data[k]; // The kernel basis function
 
-        int u = kernel->u;
-        int v = kernel->v;
-        int xOrder = kernel->xOrder;
-        int yOrder = kernel->yOrder;
+        int u = kernel->u;
+        int v = kernel->v;
+        int xOrder = kernel->xOrder;
+        int yOrder = kernel->yOrder;
 
-        // Evaluate polynomial
-        poly->mask[xOrder][yOrder] = 0;
-        double evaluation = solution->data.F64[k] * psPolynomial2DEval(poly, x, y);
-        poly->mask[xOrder][yOrder] = 1;
+        // Evaluate polynomial
+        poly->mask[xOrder][yOrder] = 0;
+        double evaluation = solution->data.F64[k] * psPolynomial2DEval(poly, x, y);
+        poly->mask[xOrder][yOrder] = 1;
 
-        image->data.F32[v + yKernel][u + xKernel] += (float)evaluation;
-        kernelSum += (float)evaluation;
+        image->data.F32[v + yKernel][u + xKernel] += (float)evaluation;
+        kernelSum += (float)evaluation;
     }