Changeset 14341

Timestamp:

Jul 20, 2007, 11:36:42 AM (19 years ago)

Author:

Paul Price

Message:

Adding output with the kernel parameters.

File:

• trunk/psModules/src/imcombine/pmSubtractionKernels.c (modified) (7 diffs)

trunk/psModules/src/imcombine/pmSubtractionKernels.c

@@ -74 +74 @@
                                                               size, spatialOrder); // The kernels
 
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "POIS kernel: %d,%d --> %d elements",
+             size, spatialOrder, num);
+
     // Generate a set of kernels for each (u,v)
     for (int v = - size, index = 0; v <= size; v++) {
@@ -116 +119 @@
 
     int num = 0;                        // Number of basis functions
+    psString params = NULL;             // List of parameters
     for (int i = 0; i < numGaussians; i++) {
         int gaussOrder = orders->data.S32[i]; // Polynomial order to apply to Gaussian
+        psStringAppend(&params, "(%.2f,%d)", sigmas->data.F32[i], orders->data.S32[i]);
         num += (gaussOrder + 1) * (gaussOrder + 2) / 2;
     }
@@ -124 +129 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_ISIS,
                                                               size, spatialOrder); // The kernels
+
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "ISIS kernel: %s,%d --> %d elements",
+             params, spatialOrder, num);
+    psFree(params);
+
     kernels->sigma = psVectorAlloc(num, PS_TYPE_F32);
     kernels->preCalc = psArrayAlloc(num);
@@ -213 +223 @@
                                                               size, spatialOrder); // The kernels
 
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "SPAM kernel: %d,%d,%d,%d --> %d elements",
+             size, inner, binning, spatialOrder, num);
+
     kernels->uStop = psVectorAlloc(num, PS_TYPE_F32);
     kernels->vStop = psVectorAlloc(num, PS_TYPE_F32);
@@ -316 +329 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_FRIES,
                                                               size, spatialOrder); // The kernels
+
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "FRIES kernel: %d,%d,%d --> %d elements",
+             size, inner, spatialOrder, num);
+
     kernels->uStop = psVectorAlloc(num, PS_TYPE_F32);
     kernels->vStop = psVectorAlloc(num, PS_TYPE_F32);
@@ -399 +416 @@
     int numGaussians = sigmas->n;       // Number of Gaussians
     int numGaussianVars = 0;            // Number of Gaussian variant functions in the kernel
+    psString params = NULL;             // List of params
     for (int i = 0; i < numGaussians; i++) {
         int gaussOrder = orders->data.S32[i]; // Polynomial order to apply to Gaussian
         numGaussianVars += (gaussOrder + 1) * (gaussOrder + 2) / 2;
+        psStringAppend(&params, "(%.2f,%d)", sigmas->data.F32[i], orders->data.S32[i]);
     }
 
@@ -411 +430 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_GUNK,
                                                               size, spatialOrder); // The kernels
+
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "GUNK kernel: %d,%s,%d --> %d elements",
+             inner, params, spatialOrder, num);
+    psFree(params);
+
     kernels->sigma = psVectorAlloc(numGaussianVars * numSpatial, PS_TYPE_F32);
     kernels->preCalc = psArrayAlloc(numGaussianVars * numSpatial);