Changeset 32694 for branches/eam_branches/ipp-20111110/ippconfig

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

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

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

@@ -219 +219 @@
 END
 
+SSTF_DIFF METADATA
+        DUAL            BOOL    FALSE   # Dual convolution?
+        INVERSE         BOOL    FALSE   # Generate inverse subtraction?
+        PHOTOMETRY      BOOL    TRUE    # Perform photometry?
+        NOCONVOLVE      BOOL    TRUE
+        CONVOLVE.TARGET STR     SINGLE2 # convolution direction
+END
+ 
+
 # 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

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

@@ -216 +216 @@
 # @RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 345.0 539.1 841.0 1305.0 #
 
-# PS1 values?
-@RADIAL.ANNULAR.BINS.LOWER           F32      0.0 1.2 3.4 5.2  8.8 15.0 23.2 37.2 57.1  91.0 141.0  # perl parser fails without a comment ticket #1476
-@RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1  # perl parser fails without a comment ticket #1476
+# PS1 values? (revised fpr PS1 @0.25 arcsec pixel scales) 
+@RADIAL.ANNULAR.BINS.LOWER           F32      0.0 0.96 2.72 4.16 7.04 12.0 18.56 29.76 45.68 72.80 112.80    # perl parser fails without a comment ticket #1476 still?
+@RADIAL.ANNULAR.BINS.UPPER           F32      0.96 2.72 4.16 7.04 12.0 18.56 29.76 45.68 72.80 112.80 176.88 # perl parser fails without a comment ticket #1476 still?
 
 # Extended source fit parameters
@@ -355 +355 @@
   PETROSIAN_FOR_STARS                 BOOL  FALSE
 
+  CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE 
+  POISSON.ERRORS.PHOT.LMM             BOOL  TRUE
+
   EXT_FIT_MAX_RADIUS                  F32   50.0
   PSF_MODEL                           STR   PS_MODEL_GAUSS 
@@ -505 +508 @@
 END
 
+SSTF_DIFF METADATA
+  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
+END
+
+
 # Recipe overrides for PR reduction
 PR      METADATA

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

@@ -165 +165 @@
         PSVIDEOPHOT             STR     PSVIDEOPHOT
 END
+
+
 
 # basic science analysis
@@ -262 +264 @@
 
 
+
 DEFAULT_MASKTEST                METADATA
         CHIP_PPIMAGE    STR     CHIP_MASKTEST
@@ -282 +285 @@
         BACKGROUND_PSWARP       STR     BACKGROUND
 END
+
+# SSTF tests
+SSTF_NOCONV             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     SSTF_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
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+        PSVIDEOPHOT             STR     PSVIDEOPHOT
+END
+
+SSTF_NOCONV_4SIG                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     SSTF_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
+
+SSTF_4SIG               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     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
+
 
 # reduction class specifically for warpwarp diffs: