Changeset 26479 for branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionKernels.h

Timestamp:

Dec 23, 2009, 8:08:30 AM (17 years ago)

Author:

eugene

Message:

adding deconvolved hermite functions

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionKernels.h (modified) (4 diffs)

branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionKernels.h

@@ -11 +11 @@
     PM_SUBTRACTION_KERNEL_ISIS,         ///< Traditional kernel --- gaussians modified by polynomials
     PM_SUBTRACTION_KERNEL_HERM,         ///< Hermitian polynomial kernels
+    PM_SUBTRACTION_KERNEL_DECON_HERM,   ///< Deconvolved Hermitian polynomial kernels
     PM_SUBTRACTION_KERNEL_SPAM,         ///< Summed Pixels for Advanced Matching --- summed delta functions
     PM_SUBTRACTION_KERNEL_FRIES,        ///< Fibonacci Radius Increases Excellence of Subtraction
@@ -31 +32 @@
     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 or HERM)
-    psVector *widths;                   ///< Gaussian FWHMs (ISIS or HERM)
+    psVector *u, *v;                    ///< Offset (for POIS) or polynomial order (for ISIS, HERM or DECON_HERM)
+    psVector *widths;                   ///< Gaussian FWHMs (ISIS, HERM or DECON_HERM)
     psVector *uStop, *vStop;            ///< Width of kernel element (SPAM,FRIES only)
-    psArray *preCalc;                   ///< Array of images containing pre-calculated kernel (for ISIS or HERM)
+    psArray *preCalc;                   ///< Array of images containing pre-calculated kernel (for ISIS, HERM or DECON_HERM)
     float penalty;                      ///< Penalty for wideness
     psVector *penalties;                ///< Penalty for each kernel component
@@ -70 +71 @@
         PS_ASSERT_VECTOR_SIZE((KERNELS)->widths, (KERNELS)->num, RETURNVALUE); \
     } \
+    if ((KERNELS)->type == PM_SUBTRACTION_KERNEL_DECON_HERM) { \
+        PS_ASSERT_VECTOR_NON_NULL((KERNELS)->widths, RETURNVALUE); \
+        PS_ASSERT_VECTOR_TYPE((KERNELS)->widths, PS_TYPE_F32, RETURNVALUE); \
+        PS_ASSERT_VECTOR_SIZE((KERNELS)->widths, (KERNELS)->num, RETURNVALUE); \
+    } \
     if ((KERNELS)->uStop || (KERNELS)->vStop) { \
         PS_ASSERT_VECTOR_NON_NULL((KERNELS)->uStop, RETURNVALUE); \
@@ -157 +163 @@
                                                );
 
+/// Generate DECON_HERM kernels
+pmSubtractionKernels *pmSubtractionKernelsDECON_HERM(int size, ///< Half-size of the kernel
+                                                     int spatialOrder, ///< Order of spatial variations
+                                                     const psVector *fwhms, ///< Gaussian FWHMs
+                                                     const psVector *orders, ///< order of hermitian polynomials
+                                                     float penalty, ///< Penalty for wideness
+                                                     pmSubtractionMode mode ///< Mode for subtraction
+    );
+
 /// Generate SPAM kernels
 pmSubtractionKernels *pmSubtractionKernelsSPAM(int size, ///< Half-size of the kernel