Changeset 34772 for branches/czw_branch/20120906/ippconfig/recipes/ppSub.config

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/ippconfig

Files:

• . (modified) (1 prop)
• recipes/ppSub.config (modified) (2 diffs, 1 prop)

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

@@ -90 +90 @@
 # Recipe overrides for DIFF
 DIFF    METADATA
-END
-
-# Difference of two warps
-WARPWARP        METADATA
-        DUAL            BOOL    TRUE    # Dual convolution?
+#       DUAL            BOOL    TRUE    # Dual convolution?
         INVERSE         BOOL    TRUE    # Generate inverse subtraction?
         PHOTOMETRY      BOOL    TRUE    # Perform photometry?
-
+        NOCONVOLVE      BOOL    TRUE    # CZW REMOVE THIS!
         # penalty of 1.0
         # DUAL convolution is more sensitive to the number of kernels
@@ -112 +108 @@
 END
 
+# Difference of two warps
+WARPWARP        METADATA
+        DUAL            BOOL    TRUE    # Dual convolution?
+        INVERSE         BOOL    TRUE    # 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
+
 # Difference of warp - stack
 WARPSTACK       METADATA
         DUAL            BOOL    FALSE   # Dual convolution?
         INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        NOCONVOLVE      BOOL    TRUE    # CZW REMOVE THIS!
         PHOTOMETRY      BOOL    TRUE    # Perform photometry?
         CONVOLVE.TARGET STR     SINGLE2 # convolution direction