Changeset 38064

Timestamp:

Mar 29, 2015, 8:07:09 AM (11 years ago)

Author:

eugene

Message:

merge changes from tags/ipp-20150312 (add DIFF_PV3 to WARPSTACK_PV3, set DIFF_PV3 output to PS1_DV5, add CHIP.MAP.FROM.POSITIVE

Location:

trunk/ippconfig

Files:

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

trunk/ippconfig/recipes/ppSub.config

@@ -77 +77 @@
 PHOTOMETRY      BOOL    FALSE           # Perform photometry?
 NOCONVOLVE      BOOL    FALSE           # Skip convolution?
-
+CHIP.MAP.FROM.POSITIVE BOOL FALSE       # use the warp for the chipmap, not subtrahend
 
 FORCED.PHOTOMETRY.BOTH BOOL FALSE       # forced photometry on input sources?
@@ -184 +184 @@
 # WSdiff for PV3 to do inverse phot
 WARPSTACK_PV3       METADATA
-        DUAL            BOOL    FALSE   # Dual convolution?
-        INVERSE         BOOL    TRUE   # Generate inverse subtraction?
-        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
-        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+        DUAL                   BOOL    FALSE   # Dual convolution?
+        INVERSE                BOOL    TRUE    # Generate inverse subtraction?
+        PHOTOMETRY             BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET        STR     SINGLE2 # convolution direction
+        CHIP.MAP.FROM.POSITIVE BOOL    FALSE   # always use the warp for the chipmap, not subtrahend
 END
 

trunk/ippconfig/recipes/psphot.config

@@ -655 +655 @@
 END
 
+# Recipe overrides for DIFF_PV3
+DIFF_PV3        METADATA
+  DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
+  OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
+
+  # Extended source fit parameters
+  # these models are used for high-quality shape analysis after all sources have been removed
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform the detailed extended sourc fits?
+  EXT_MODEL                           STR   PS_MODEL_TRAIL
+
+  # extended source models applied to sources
+  EXTENDED_SOURCE_MODELS METADATA 
+    TYPE      EXTENDED_SOURCE_MODEL  MODEL            SNLIM   PSF_CONVOLVED
+    TRAIL_RAW EXTENDED_SOURCE_MODEL  PS_MODEL_TRAIL    10.0   FALSE
+  END
+END
+
 SSTF_DIFF METADATA
   PEAKS_NSIGMA_LIMIT_2              F32  3.5           # peak significance threshold -- MOPS would like to see 4.0->3.5 since ppMops fixed

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -599 +599 @@
 WARPSTACK_PV3       METADATA
         DIFF_PPSUB      STR     WARPSTACK_PV3
-        DIFF_PSPHOT     STR     DIFF
+        DIFF_PSPHOT     STR     DIFF_PV3
         JPEG_BIN1       STR     PPIMAGE_J1
         JPEG_BIN2       STR     PPIMAGE_J2