Changeset 37970

Timestamp:

Mar 12, 2015, 3:04:07 PM (11 years ago)

Author:

eugene

Message:

add DIFF_PV recipes for psphot, set output format to PS1_DV5 for diff; warp-stack style chipmap; do not write out the images

Location:

tags/ipp-20150312/ippconfig/recipes

Files:

• filerules-split.mdc (modified) (2 diffs)
• ppSub.config (modified) (1 diff)
• psphot.config (modified) (1 diff)
• reductionClasses.mdc (modified) (1 diff)

tags/ipp-20150312/ippconfig/recipes/filerules-split.mdc

@@ -305 +305 @@
 SKYCELL.TEMPLATE             OUTPUT {OUTPUT}.skycell                  SKYCELL         NONE       FPA        TRUE      NONE
                                                                                                               
-PPSUB.OUTPUT                 OUTPUT {OUTPUT}.fits                     IMAGE           NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.MASK            OUTPUT {OUTPUT}.mask.fits                MASK            NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.VARIANCE        OUTPUT {OUTPUT}.wt.fits                  VARIANCE        NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT                 OUTPUT {OUTPUT}.fits                     IMAGE           NONE       FPA        FALSE     NONE
+PPSUB.OUTPUT.MASK            OUTPUT {OUTPUT}.mask.fits                MASK            NONE       FPA        FALSE     NONE
+PPSUB.OUTPUT.VARIANCE        OUTPUT {OUTPUT}.wt.fits                  VARIANCE        NONE       FPA        FALSE     NONE
 PPSUB.OUTPUT.SOURCES         OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
 PPSUB.OUTPUT.KERNELS         OUTPUT {OUTPUT}.subkernel                SUBKERNEL       NONE       FPA        TRUE      NONE
@@ -313 +313 @@
 PPSUB.OUTPUT.JPEG2           OUTPUT {OUTPUT}.b2.jpg                   JPEG            NONE       FPA        TRUE      NONE
 PPSUB.OUTPUT.RESID.JPEG      OUTPUT {OUTPUT}.res.jpg                  JPEG            NONE       FPA        TRUE      NONE
-PPSUB.INVERSE                OUTPUT {OUTPUT}.inv.fits                 IMAGE           NONE       FPA        TRUE      NONE
-PPSUB.INVERSE.MASK           OUTPUT {OUTPUT}.inv.mask.fits            MASK            NONE       FPA        TRUE      NONE
-PPSUB.INVERSE.VARIANCE       OUTPUT {OUTPUT}.inv.wt.fits              VARIANCE        NONE       FPA        TRUE      NONE
+PPSUB.INVERSE                OUTPUT {OUTPUT}.inv.fits                 IMAGE           NONE       FPA        FALSE     NONE
+PPSUB.INVERSE.MASK           OUTPUT {OUTPUT}.inv.mask.fits            MASK            NONE       FPA        FALSE     NONE
+PPSUB.INVERSE.VARIANCE       OUTPUT {OUTPUT}.inv.wt.fits              VARIANCE        NONE       FPA        FALSE     NONE
 PPSUB.INVERSE.SOURCES        OUTPUT {OUTPUT}.inv.cmf                  CMF             NONE       FPA        TRUE      NONE
 PPSUB.CONFIG                 OUTPUT {OUTPUT}.ppSub.mdc                TEXT            NONE       FPA        TRUE      NONE

tags/ipp-20150312/ippconfig/recipes/ppSub.config

@@ -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
 

tags/ipp-20150312/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

tags/ipp-20150312/ippconfig/recipes/reductionClasses.mdc

@@ -574 +574 @@
 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