Changeset 30767

Timestamp:

Mar 1, 2011, 9:56:14 AM (15 years ago)

Author:

eugene

Message:

add reduction options for STACKPHOT PSPHOT, PPSUB and PPSTACK

Location:

branches/eam_branches/ipp-20110213/ippconfig

Files:

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

branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config

@@ -37 +37 @@
     OUTPUT.LOGFLUX  BOOL    TRUE
 END
+
+# Recipe overrides for STACK
+STACKPHOT METADATA
+  PSF.MODEL     STR     PS_MODEL_QGAUSS # Model for PSF match
+END

branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config

@@ -97 +97 @@
 END
 
+# Recipe overrides for STACK
+STACKPHOT METADATA
+END
 
 # Debugging

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

@@ -125 +125 @@
 END
 
+# Difference of two stacks : uses SINGLE not DUAL convolution
+STACKPHOT       METADATA
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+
 # Difference of warp - stack
 WARPSTACK_FORCED     METADATA

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

@@ -328 +328 @@
 
 # Extended source fit parameters
-STACKPHOT_TEST                       METADATA
-  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_SN_LIM              F32   20.0
-  EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
-  EXTENDED_SOURCE_KRON                BOOL  FALSE
-  PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
-  PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
-  PSPHOT.STACK.TARGET.PSF.FWHM        F32   4.5  # FWHM of target PSF (if NOT AUTO sized; pixels)
-END
-
-# Extended source fit parameters
 STACKPHOT                             METADATA
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
@@ -356 +343 @@
 
   EXT_FIT_MAX_RADIUS                  F32   50.0
-  PSF_MODEL                           STR   PS_MODEL_GAUSS 
+  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
+  EXT_MODEL                           STR   PS_MODEL_SERSIC
+END
+
+# Extended source fit parameters
+STACKPHOT_TEST                        METADATA
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_SN_LIM              F32   20.0
+  EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
+  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
+  PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
+  PSPHOT.STACK.USE.RAW                BOOL  F    # perform photometry & morphology analysis on the raw image
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+  RADIAL_APERTURES                    BOOL  T    # calculate flux in circular radial apertures?
+  RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
+  OUTPUT.FORMAT                       STR   PS1_SV1
+
+  EXT_FIT_MAX_RADIUS                  F32   50.0
+  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
   EXT_MODEL                           STR   PS_MODEL_SERSIC
 END

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

@@ -144 +144 @@
 # basic science analysis
 DEFAULT         METADATA
-        CHIP_PPIMAGE    STR     CHIP
-        CHIP_PSPHOT     STR     CHIP
-        WARP_PSWARP     STR     WARP
-        STACK_PPSTACK   STR     STACK
-        STACK_PPSUB     STR     STACK
-        STACK_PSPHOT    STR     STACK
-        DIFF_PPSUB      STR     DIFF
-        DIFF_PSPHOT     STR     DIFF
-        JPEG_BIN1       STR     PPIMAGE_J1
-        JPEG_BIN2       STR     PPIMAGE_J2
-        FAKEPHOT        STR     FAKEPHOT
-        ADDSTAR         STR     ADDSTAR
-        PSASTRO         STR     DEFAULT_RECIPE
-        STACKPHOT       STR     STACKPHOT
+        CHIP_PPIMAGE      STR     CHIP
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        STACK_PPSTACK     STR     STACK
+        STACK_PPSUB       STR     STACK
+        STACK_PSPHOT      STR     STACK
+        DIFF_PPSUB        STR     DIFF
+        DIFF_PSPHOT       STR     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
         BACKGROUND_PPBACKGROUND STR     BACKGROUND
         BACKGROUND_PSWARP       STR     BACKGROUND
@@ -311 +313 @@
         PSASTRO         STR     PS1_REFERENCE
         STACKPHOT       STR     STACKPHOT
+END
+
+# stackphot (static sky) test reduction
+STACKPHOT_TEST  METADATA
+        STACKPHOT_PSPHOT  STR     STACKPHOT_TEST
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
 END