Changeset 31253 for branches/czw_branch/20110406/ippconfig

Timestamp:

Apr 8, 2011, 6:31:08 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk

Location:

branches/czw_branch/20110406

Files:

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

branches/czw_branch/20110406/ippconfig/recipes/nightly_science.config

@@ -203 +203 @@
   NAME      STR STS
   DISTRIBUTION STR STS
-  TESS      STR STS
+  TESS      STR STS.V3
   OBSMODE   STR STS%
   OBJECT    STR STS%

branches/czw_branch/20110406/ippconfig/recipes/ppStack.config

@@ -123 +123 @@
 END
 
+QUICKSTACK    METADATA
+        CONVOLVE        BOOL   FALSE
+        COMBINE.REJ     F32    3.0
+        COMBINE.DISCARD F32    0.3
+        MASK.VAL        STR    MASK.VALUE,CONV.BAD,GHOST,BURNTOOL # Mask value of input bad pixels
+END
 
 # 

branches/czw_branch/20110406/ippconfig/recipes/psphot.config

@@ -203 +203 @@
 
 # define the annuli (in pixels) for surface brightness measurements
-# @RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0
-# @RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0
+# @RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0 # comment due to ticket #1476
+# @RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0 #
 
 # SDSS values (in SDSS pixels)
-#@RADIAL.ANNULAR.BINS.LOWER           F32     0.00 0.56 1.69 2.59 4.41  7.51 11.58 18.58 28.55 45.50  70.51 110.53 172.49 269.52 420.51
-#@RADIAL.ANNULAR.BINS.UPPER           F32     0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50
+#@RADIAL.ANNULAR.BINS.LOWER           F32     0.00 0.56 1.69 2.59 4.41  7.51 11.58 18.58 28.55 45.50  70.51 110.53 172.49 269.52 420.51 #
+#@RADIAL.ANNULAR.BINS.UPPER           F32     0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50 #
 
 # PS1 values? (all SDSS @ PS1 0.2 arcsec pixel scales)
-# @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 221.1 345.0 539.1  841.0
-# @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
+# @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 221.1 345.0 539.1  841.0 #
+# @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 
-@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 
+@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
 
 # Extended source fit parameters

branches/czw_branch/20110406/ippconfig/recipes/reductionClasses.mdc

@@ -239 +239 @@
 END
 
+# quick stacks
+QUICKSTACK            METADATA
+      STACK_PPSTACK   STR      QUICKSTACK
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
 # basic science analysis
 PHOTFEST.SINGLE1        METADATA
@@ -632 +639 @@
 END
 
+STS_DATASET 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 STS_DATASET
+   STACKPHOT       STR     STACKPHOT
+END
+