Changeset 34735 for branches/eam_branches/ipp-20120905/ippconfig

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/nightly_science.config (modified) (2 diffs)
• ippconfig/recipes/ppSub.config (modified) (1 diff)
• ippconfig/recipes/psphot.config (modified) (2 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 diff, 1 prop)

branches/eam_branches/ipp-20120905/ippconfig/recipes/nightly_science.config

@@ -79 +79 @@
   DIFFABLE  BOOL FALSE
   DIST      S16  30
+  # bump the retention times for the time being
+  CHIP S16 60
+  WARP S16 60
+  DIFF S16 60
+  CHIPBG S16 60
+  WARPBG S16 60
 END
 TARGETS METADATA
@@ -211 +217 @@
   REDUCTION STR STS_DATASET
   # bump the retention times for the time being
-  CHIP S16 7
-  WARP S16 7
-  DIFF S16 7
+  CHIP S16 60
+  WARP S16 60
+  DIFF S16 60
 END
 TARGETS METADATA

branches/eam_branches/ipp-20120905/ippconfig/recipes/ppSub.config

@@ -90 +90 @@
 # Recipe overrides for DIFF
 DIFF    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
 

branches/eam_branches/ipp-20120905/ippconfig/recipes/psphot.config

@@ -558 +558 @@
 DIFF    METADATA
   DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
-  OUTPUT.FORMAT                     STR  PS1_DV2       # Format of output file
+  OUTPUT.FORMAT                     STR  PS1_DV3       # Format of output file
 
   # Extended source fit parameters
@@ -575 +575 @@
   PEAKS_NSIGMA_LIMIT_2                F32   4.0             # peak significance threshold  
   DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
-  OUTPUT.FORMAT                     STR  PS1_DV2       # Format of output file
+  OUTPUT.FORMAT                     STR  PS1_DV3       # Format of output file
 
   # Extended source fit parameters

branches/eam_branches/ipp-20120905/ippconfig/recipes/reductionClasses.mdc

@@ -260 +260 @@
         STACK_PSPHOT      STR     STACK
         DIFF_PPSUB        STR     DIFF
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+        FAKEPHOT          STR     FAKEPHOT
+        ADDSTAR           STR     ADDSTAR
+        PSASTRO           STR     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+# Sweetspot reduction class
+SWEETSPOT_WS            METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     QUICKSTACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     WARPSTACK
         DIFF_PSPHOT       STR     SSTF_DIFF
         JPEG_BIN1         STR     PPIMAGE_J1