Changeset 29060 for branches/sc_branches/trunkTest/psModules/src/imcombine/pmSubtractionKernels.h

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionKernels.h (modified) (2 diffs)

branches/sc_branches/trunkTest/psModules/src/imcombine/pmSubtractionKernels.h

@@ -39 +39 @@
     psArray *preCalc;                   ///< Array of images containing pre-calculated kernel (for ISIS, HERM or DECONV_HERM)
     float penalty;                      ///< Penalty for wideness
-    psVector *penalties;                ///< Penalty for each kernel component
+    psVector *penalties1;               ///< Penalty for each kernel component
+    psVector *penalties2;               ///< Penalty for each kernel component
+    bool havePenalties;                 ///< flag to test if we have already calculated the penalties or not.
     int size;                           ///< The half-size of the kernel
     int inner;                          ///< The size of an inner region
@@ -308 +310 @@
     );
 
-
 #endif