Changeset 31302 for branches/czw_branch/20110406/ippconfig

Timestamp:

Apr 15, 2011, 4:01:30 PM (15 years ago)

Author:

watersc1

Message:

Unconvolved diff code. Needs to be checked before merging into the trunk.

Location:

branches/czw_branch/20110406/ippconfig/recipes

Files:

• ppSub.config (modified) (2 diffs)
• reductionClasses.mdc (modified) (1 diff)

branches/czw_branch/20110406/ippconfig/recipes/ppSub.config

@@ -76 +76 @@
 INVERSE         BOOL    FALSE           # Generate inverse subtraction?
 PHOTOMETRY      BOOL    FALSE           # Perform photometry?
+NOCONVOLVE      BOOL    FALSE           # Skip convolution?
+
 
 FORCED.PHOTOMETRY.BOTH BOOL FALSE       # forced photometry on input sources?
@@ -141 +143 @@
  FORCED.PHOTOMETRY.BOTH BOOL    TRUE    # forced photometry on input sources
 END
+
+# Difference of warp - quickstack
+WARPQSTACK      METADATA
+        DUAL            BOOL    TRUE    # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+
+        # penalty of 1.0
+        # DUAL convolution is more sensitive to the number of kernels
+        # do not provide as many orders as for SINGLE
+        # @ISIS.WIDTHS  F32     2.4  5.0  10.0  # Gaussian kernel FWHM values
+        @ISIS.WIDTHS    F32     1.5  3.0  6.0   # Gaussian kernel FWHM values
+        # @ISIS.WIDTHS  F32     2.0  3.0  5.0   # Gaussian kernel FWHM values
+        # @ISIS.WIDTHS  F32     2.1  4.2  8.4   # Gaussian kernel FWHM values
+        @ISIS.ORDERS    S32     2    2    2     # Polynomial orders for ISIS kernels
+
+        SCALE.REF       F32     5.0             # FWHM reference for kernel parameter scaling
+        KERNEL.SIZE     S32     15              # Kernel half-size (pixels)
+        STAMP.FOOTPRINT S32     15              # Size of stamps (pixels)
+END
+
+# Do no convolution
+UNCONVOLVED     METADATA
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    FALSE   # Perform photometry?
+        NOCONVOLVE      BOOL    TRUE
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+
+# Difference of warp - junkstack
+WARPJSTACK      METADATA
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET STR     SINGLE1 # convolution direction
+END
+
 
 #PR image class

branches/czw_branch/20110406/ippconfig/recipes/reductionClasses.mdc

@@ -217 +217 @@
 END
 
+WARPQSTACK      METADATA
+        DIFF_PPSUB      STR     WARPQSTACK
+        DIFF_PSPHOT     STR     DIFF
+        JPEG_BIN1       STR     PPIMAGE_J1
+        JPEG_BIN2       STR     PPIMAGE_J2
+END
+
+NOCONVDIFF      METADATA
+        DIFF_PPSUB      STR     UNCONVOLVED
+        DIFF_PSPHOT     STR     DIFF
+        JPEG_BIN1       STR     PPIMAGE_J1
+        JPEG_BIN2       STR     PPIMAGE_J2
+END
+
 # reduction classes for different stacks
 # regular stacks