Changeset 27838 for branches/tap_branches/psModules/src/imcombine/pmSubtractionMatch.h

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionMatch.h (modified) (3 diffs)

branches/tap_branches/psModules/src/imcombine/pmSubtractionMatch.h

@@ -39 +39 @@
                         int iter,       ///< Rejection iterations
                         float rej,      ///< Rejection threshold
-                        float sysError, ///< Relative systematic error
+                        float normFrac, ///< Fraction of flux in window for normalisation window
+                        float sysError, ///< Relative systematic error in images
+                        float skyError, ///< Relative systematic error in images
+                        float kernelError, ///< Relative systematic error in kernel
+                        float covarFrac,   ///< Fraction for kernel truncation before covariance calculation
                         psImageMaskType maskVal, ///< Value to mask for input
                         psImageMaskType maskBad, ///< Mask for output bad pixels
@@ -55 +59 @@
                                psMetadata *analysis, ///< Analysis metadata with pre-calculated kernel, region
                                int stride, ///< Size for convolution patches
-                               float sysError, ///< Relative systematic error
+                               float kernelError, ///< Relative systematic error in kernel
+                               float covarFrac,   ///< Fraction for kernel truncation before covariance calc.
                                psImageMaskType maskVal, ///< Value to mask for input
                                psImageMaskType maskBad, ///< Mask for output bad pixels
@@ -93 +98 @@
     );
 
+
+/// Scale subtraction parameters according to the FWHMs of the inputs
+bool pmSubtractionParamsScale(
+    int *kernelSize,                    ///< Half-size of the kernel
+    int *stampSize,                     ///< Half-size of the stamp (footprint)
+    psVector *widths,                   ///< ISIS widths
+    float fwhm1, float fwhm2,           ///< FWHMs for inputs
+    float scaleRef,                     ///< Reference width for scaling
+    float scaleMin,                     ///< Minimum scaling ratio, or NAN
+    float scaleMax                      ///< Maximum scaling ratio, or NAN
+    );
+
+
 #endif