Changeset 14525

Timestamp:

Aug 15, 2007, 5:15:45 PM (19 years ago)

Author:

Paul Price

Message:

Adding kernel description

Location:

trunk/psModules/src/imcombine

Files:

• pmSubtractionKernels.c (modified) (8 diffs)
• pmSubtractionKernels.h (modified) (1 diff)

trunk/psModules/src/imcombine/pmSubtractionKernels.c

@@ -15 +15 @@
 static void subtractionKernelsFree(pmSubtractionKernels *kernels)
 {
+    psFree(kernels->description);
     psFree(kernels->u);
     psFree(kernels->v);
@@ -49 +50 @@
 
     kernels->type = type;
+    kernels->description = NULL;
     kernels->num = numBasisFunctions;
     kernels->u = psVectorAlloc(numBasisFunctions, PS_TYPE_S32);
@@ -74 +76 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_POIS,
                                                               size, spatialOrder); // The kernels
+    psStringAppend(&kernels->description, "POIS(%d,%d)", size, spatialOrder);
 
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "POIS kernel: %d,%d --> %d elements",
@@ -118 +121 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_ISIS,
                                                               size, spatialOrder); // The kernels
+    psStringAppend(&kernels->description, "ISIS(%d,%s,%d)", size, params, spatialOrder);
 
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "ISIS kernel: %s,%d --> %d elements",
@@ -214 +218 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_SPAM,
                                                               size, spatialOrder); // The kernels
+    psStringAppend(&kernels->description, "SPAM(%d,%d,%d,%d)", size, inner, binning, spatialOrder);
 
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "SPAM kernel: %d,%d,%d,%d --> %d elements",
@@ -310 +315 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_FRIES,
                                                               size, spatialOrder); // The kernels
+    psStringAppend(&kernels->description, "FRIES(%d,%d,%d)", size, inner, spatialOrder);
 
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "FRIES kernel: %d,%d,%d --> %d elements",
@@ -400 +406 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_GUNK,
                                                               size, spatialOrder); // The kernels
+    psStringAppend(&kernels->description, "GUNK(%d,%d,%s,%d)", size, inner, params, spatialOrder);
 
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "GUNK kernel: %d,%s,%d --> %d elements",
@@ -504 +511 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_RINGS,
                                                               size, spatialOrder); // The kernels
+    psStringAppend(&kernels->description, "RINGS(%d,%d,%d,%d)", size, inner, ringsOrder, spatialOrder);
 
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "RINGS kernel: %d,%d,%d,%d --> %d elements",

trunk/psModules/src/imcombine/pmSubtractionKernels.h

@@ -18 +18 @@
 typedef struct {
     pmSubtractionKernelsType type;      ///< Type of kernels --- allowing the use of multiple kernels
+    psString description;               ///< Description of the kernel parameters
     long num;                           ///< Number of kernel components (not including the spatial ones)
     psVector *u, *v;                    ///< Offset (for POIS) or polynomial order (for ISIS)