Changeset 27835 for branches/tap_branches/ippconfig/recipes/ppSub.config

Timestamp:

May 3, 2010, 8:35:20 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches/ippconfig

Files:

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

branches/tap_branches/ippconfig/recipes/ppSub.config

@@ -1 +1 @@
 ### Recipe file for ppSub
 
-KERNEL.TYPE     STR     ISIS            # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS)
-KERNEL.SIZE     S32     15              # Kernel half-size (pixels)
-SPATIAL.ORDER   S32     0               # Spatial polynomial order
+KERNEL.TYPE     STR     ISIS            # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS)
+KERNEL.SIZE     S32     20              # Kernel half-size (pixels)
+SPATIAL.ORDER   S32     1               # Spatial polynomial order
 REGION.SIZE     F32     0               # Iso-kernel region size (pixels)
 SOURCE.RADIUS   F32     3.0             # Source matching radius (pixels)
-STAMP.SPACING   F32     400             # Typical spacing between stamps (pixels)
-STAMP.FOOTPRINT S32     20              # Size of stamps (pixels)
+STAMP.SPACING   F32     300             # Typical spacing between stamps (pixels)
+STAMP.FOOTPRINT S32     25              # Size of stamps (pixels)
 STAMP.THRESHOLD F32     5               # Flux threshold for stamps (stdev above background)
 STRIDE          S32     100             # Size of convolution patches (pixels)
-ITER            S32     1               # Number of rejection iterations
+ITER            S32     2               # Number of rejection iterations
 REJ             F32     2.5             # Rejection level (std dev)
-SYS             F32     0.05            # Relative systematic error in kernel
+KERNEL.ERR      F32     0.05            # Relative systematic error in kernel
+SYS.ERR         F32     0.1             # Relative systematic error in images
+SKY.ERR         F32     0.0             # Relative systematic error in images
+NORM.FRAC       F32     0.03            # Fraction of window for normalisation window
+COVAR.FRAC      F32     0.01            # Fraction of kernel to truncate before calculating covariance
 
-MASK.IN         STR     MASK.VALUE,CONV.BAD     # Mask value for input
+MASK.VAL        STR     MASK.VALUE,CONV.BAD     # Mask value for input
 MASK.BAD        STR     CONV.BAD        # Mask value to give bad pixels
 MASK.POOR       STR     CONV.POOR       # Mask value to give poor pixels
 
 LOW.THRESHOLD   F32     4.0             # Mask pixels below this threshold (std dev)
-POOR.FRACTION   F32     0.10            # Maximum fraction of bad weight for poor pixels
+POOR.FRACTION   F32     0.20            # Maximum fraction of bad weight for poor pixels
 BADFRAC         F32     0.95            # Maximum fraction of bad pixels
-@ISIS.WIDTHS    F32     3 5 7 10        # Gaussian FWHMs for ISIS kernels
-@ISIS.ORDERS    S32     2 2 2 2         # Polynomial orders for ISIS kernels
+
+# Gene's choice: multiplying by 1.75
+#@ISIS.WIDTHS   F32     1.8 3.3 5.8 10.2 17.9   # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS   S32     2 2 2 2 2               # Polynomial orders for ISIS kernels
+# (pi/2)^i
+#@ISIS.WIDTHS   F32     1.6 2.5 3.9 6.1 9.6 15.0        # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS   S32     2 2 2 2 2 2             # Polynomial orders for ISIS kernels
+# (e/2)^i for even i
+#@ISIS.WIDTHS   F32     1.4 3.4 6.3 11.6        # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS   S32     6 4 4 2         # Polynomial orders for ISIS kernels
+# 1.69^i
+#@ISIS.WIDTHS   F32     2.9 4.8 8.2 13.8 23.3 # Gaussian FWHMs for ISIS kernels
+#@ISIS.ORDERS   S32     4 2 2 2 2       # Polynomial orders for ISIS kernels
+
+# Paul's values
+# @ISIS.WIDTHS  F32     2.9 4.8 8.2 13.8 # Gaussian FWHMs for ISIS kernels
+# @ISIS.ORDERS  S32     4 2 2 2         # Polynomial orders for ISIS kernels
+
+# Gene's values
+@ISIS.WIDTHS    F32     2.9 4.8 8.2     # Gaussian FWHMs for ISIS kernels
+@ISIS.ORDERS    S32     4   2   2       # Polynomial orders for ISIS kernels
+
 SPAM.BINNING    S32     2               # Binning in outer region for SPAM kernels
 INNER           S32     5               # Inner half-size for SPAM and FRIES kernels
@@ -39 +63 @@
 RENORM          BOOL    TRUE            # Renormalise weight maps?
 RENORM.NUM      S32     100000          # Number of samples for renormalisation
-RENORM.MIN      F32     0.6             # Minimum value for renormlisation
-RENORM.MAX      F32     1.5             # Maximum value for renormalisation
+RENORM.MIN      F32     0.2             # Minimum value for renormalization
+RENORM.MAX      F32     5.0             # Maximum value for renormalization
+
+SCALE           BOOL    TRUE            # Scale kernel parameters by the seeing?
+SCALE.REF       F32     9.0             # Reference for kernel parameter scaling
+SCALE.MIN       F32     0.7             # Minimum scale value
+SCALE.MAX       F32     1.2             # Maximum scale value
 
 INTERPOLATION   STR     LANCZOS3        # Interpolation mode for bad pixels
 
-DUAL            BOOL    FALSE           # Dual convolution?
+DUAL            BOOL    TRUE            # Dual convolution?
 INVERSE         BOOL    FALSE           # Generate inverse subtraction?
 PHOTOMETRY      BOOL    FALSE           # Perform photometry?
-SAVE.CONVOLVED  BOOL    TRUE            # Save convolved images?
+
 
 # Recipe overrides for STACK
 STACK   METADATA
-        KERNEL.SIZE     S32     15      # Kernel half-size (pixels)
-        STAMP.SPACING   F32     300     # Typical spacing between stamps (pixels)       
-        STAMP.FOOTPRINT S32     15      # Size of stamps (pixels)
-        POOR.FRACTION   F32     0.1     # Maximum fraction of bad weight for poor pixels
-        SPATIAL.ORDER   S32     0       # Spatial polynomial order
+        KERNEL.TYPE     STR     ISIS    # Kernel type
+        SCALE.REF       F32     9.0     # Reference for kernel parameter scaling
 END
 
 # Recipe overrides for DIFF
 DIFF    METADATA
+END
+
+# Recipe overrides for DIFF
+DIFF_MAGICTEST_V0       METADATA
+        SPATIAL.ORDER   S32     0               # Spatial polynomial order
 END
 
@@ -72 +103 @@
         PHOTOMETRY      BOOL    FALSE
 END
+
+TEST.ISIS METADATA
+  KERNEL.TYPE   STR     ISIS_RADIAL     # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS)
+  @ISIS.WIDTHS  F32     2.9 4.8 8.2     # Gaussian FWHMs for ISIS kernels
+  @ISIS.ORDERS  S32     4   2   2       # Polynomial orders for ISIS kernels
+END
+
+TEST.RADIAL METADATA
+END
+
+TEST.HERM METADATA
+END
+
+TEST.DECON METADATA
+END