Changeset 34840 for branches/eam_branches/ipp-20121130/ippconfig

Timestamp:

Dec 18, 2012, 5:57:51 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/ippconfig

Files:

• . (modified) (1 prop)
• gpc1/psphot.config (modified) (1 diff)
• gpc1/pswarp.config (modified) (1 diff)
• recipes/filerules-mef.mdc (modified) (5 diffs)
• recipes/filerules-simple.mdc (modified) (5 diffs)
• recipes/filerules-split.mdc (modified) (5 diffs)
• recipes/jpeg.mdc (modified) (2 diffs)
• recipes/nightly_science.config (modified) (4 diffs)
• recipes/ppBackground.mdc (modified) (1 diff)
• recipes/ppStack.config (modified) (1 diff)
• recipes/ppStats.config (modified) (1 diff)
• recipes/ppStatsFromMetadata.config (modified) (1 diff)
• recipes/ppSub.config (modified) (1 prop)
• recipes/psphot.config (modified) (2 diffs, 1 prop)
• recipes/pswarp.config (modified) (1 diff)
• recipes/reductionClasses.mdc (modified) (1 prop)

branches/eam_branches/ipp-20121130/ippconfig/gpc1/psphot.config

@@ -49 +49 @@
   DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
   OUTPUT.FORMAT                     STR  PS1_DV2       # Format of output file
+
+  PSPHOT.EXT.NSIGMA.LIMIT           F32  0.0
+  PSPHOT.EXT.DIFF.ALTERNATE         BOOL TRUE
+  PSPHOT.EXT.DIFF.ALTERNATE.THRESH  F32  1.25
+END
+
+SSTF_DIFF METADATA
+  PSPHOT.EXT.NSIGMA.LIMIT           F32  0.0
+  PSPHOT.EXT.DIFF.ALTERNATE         BOOL TRUE
+  PSPHOT.EXT.DIFF.ALTERNATE.THRESH  F32  1.25
 END
 

branches/eam_branches/ipp-20121130/ippconfig/gpc1/pswarp.config

@@ -1 +1 @@
 ASTROM.SOURCE           STR     PSASTRO.OUTPUT  # Source file rule for astrometry, or NULL
+BACKGROUND.MODEL        BOOL    TRUE
+BKG.XGRID               S32     50
+BKG.YGRID               S32     50

branches/eam_branches/ipp-20121130/ippconfig/recipes/filerules-mef.mdc

@@ -120 +120 @@
 PSWARP.SKYCELL          INPUT    @FILES        CHIP       IMAGE
 PSWARP.ASTROM           INPUT    @FILES        CHIP       CMF
+PSWARP.BKGMODEL           INPUT    @FILES        CHIP       IMAGE
 
 ## files used by ppsub
@@ -138 +139 @@
 PPSTACK.INPUT.PSF       INPUT    @FILES        CHIP       PSF
 PPSTACK.INPUT.SOURCES   INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT.BKGMODEL    INPUT    @FILES        FPA        IMAGE
 
 ## files used by ppstamp
@@ -296 +298 @@
 PSWARP.BIN2             OUTPUT {OUTPUT}.b2.fits                  IMAGE     COMP_IMG   FPA        TRUE      NONE
 PSWARP.CONFIG           OUTPUT {OUTPUT}.pswarp.mdc               TEXT      NONE       FPA        TRUE      NONE
+PSWARP.OUTPUT.BKGMODEL  OUTPUT {OUTPUT}.mdl.fits                      IMAGE           NONE       FPA        TRUE      NONE
                                                                                      
 SKYCELL.STATS           OUTPUT {OUTPUT}.stats                    STATS     NONE       FPA        TRUE      NONE
@@ -342 +345 @@
 PPSTACK.OUTPUT.JPEG1    OUTPUT {OUTPUT}.b1.jpg                   JPEG      NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.JPEG2    OUTPUT {OUTPUT}.b2.jpg                   JPEG      NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGMODEL OUTPUT {OUTPUT}.mdl.fits                 IMAGE     NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGREST  OUTPUT {OUTPUT}.bkgrest.fits             IMAGE            NONE       FPA        TRUE      NONE
 PPSTACK.CONFIG          OUTPUT {OUTPUT}.ppStack.mdc              TEXT      NONE       FPA        TRUE      NONE
                                                                                      
@@ -370 +375 @@
 PPSKYCELL.BIN1          OUTPUT {OUTPUT}.{FILE.INDEX}.b1.fits     IMAGE     NONE       FPA        TRUE      NONE
 PPSKYCELL.BIN2          OUTPUT {OUTPUT}.{FILE.INDEX}.b2.fits     IMAGE     NONE       FPA        TRUE      NONE
+PPSKYCELL.BIN1.MASK          OUTPUT {OUTPUT}.{FILE.INDEX}.b1.mk.fits     MASK     COMP_MASK       FPA        TRUE      NONE
+PPSKYCELL.BIN2.MASK          OUTPUT {OUTPUT}.{FILE.INDEX}.b2.mk.fits     MASK     COMP_MASK       FPA       TRUE      NONE
 
 LOG.IMFILE              OUTPUT {OUTPUT}.{CHIP.NAME}.log          TEXT      NONE       CHIP       TRUE      NONE

branches/eam_branches/ipp-20121130/ippconfig/recipes/filerules-simple.mdc

@@ -90 +90 @@
 PSWARP.SKYCELL            INPUT    @FILES        FPA        IMAGE     
 PSWARP.ASTROM             INPUT    @FILES        FPA        CMF
+PSWARP.BKGMODEL           INPUT    @FILES        CHIP       IMAGE
 
 ## files used by ppsub
@@ -108 +109 @@
 PPSTACK.INPUT.PSF         INPUT    @FILES        CHIP       PSF
 PPSTACK.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT.BKGMODEL    INPUT    @FILES        FPA        IMAGE
 
 ## files used by ppstamp
@@ -251 +253 @@
 PSWARP.BIN2                  OUTPUT {OUTPUT}.b2.fits              IMAGE           NONE       FPA        TRUE      NONE
 PSWARP.CONFIG                OUTPUT {OUTPUT}.pswarp.mdc           TEXT            NONE       FPA        TRUE      NONE
+PSWARP.OUTPUT.BKGMODEL       OUTPUT {OUTPUT}.mdl.fits             IMAGE           NONE   FPA        TRUE      NONE
                                                      
 SKYCELL.STATS                OUTPUT {OUTPUT}.stats                STATS           NONE       FPA        TRUE      NONE
@@ -300 +303 @@
 PPSTACK.OUTPUT.JPEG1         OUTPUT {OUTPUT}.b1.jpg               JPEG            NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.JPEG2         OUTPUT {OUTPUT}.b2.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGMODEL      OUTPUT {OUTPUT}.mdl.fits             IMAGE           NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGREST       OUTPUT {OUTPUT}.bkgrest.fits         IMAGE           NONE       FPA        TRUE      NONE
 PPSTACK.CONFIG               OUTPUT {OUTPUT}.ppStack.mdc          TEXT            NONE       FPA        TRUE      NONE
                                              
@@ -327 +332 @@
 PPSKYCELL.BIN1               OUTPUT {OUTPUT}.{FILE.INDEX}.b1.fits     IMAGE     NONE       FPA        TRUE      NONE
 PPSKYCELL.BIN2               OUTPUT {OUTPUT}.{FILE.INDEX}.b2.fits     IMAGE     NONE       FPA        TRUE      NONE
+PPSKYCELL.BIN1.MASK          OUTPUT {OUTPUT}.b1.mk.fits     MASK     COMP_MASK       FPA        TRUE      NONE
+PPSKYCELL.BIN2.MASK          OUTPUT {OUTPUT}.b2.mk.fits     MASK     COMP_MASK       FPA       TRUE      NONE
 
 LOG.IMFILE                   OUTPUT {OUTPUT}.imfile.log           TEXT            NONE       FPA        TRUE      NONE

branches/eam_branches/ipp-20121130/ippconfig/recipes/filerules-split.mdc

@@ -108 +108 @@
 PSWARP.SKYCELL            INPUT    @FILES        FPA        IMAGE
 PSWARP.ASTROM             INPUT    @FILES        CHIP       CMF
+PSWARP.BKGMODEL           INPUT    @FILES        CHIP       IMAGE
                           
 ## files used by ppsub    
@@ -126 +127 @@
 PPSTACK.INPUT.PSF         INPUT    @FILES        CHIP       PSF
 PPSTACK.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT.BKGMODEL    INPUT    @FILES        FPA        IMAGE
                           
 ## files used by ppstamp  
@@ -278 +280 @@
 PSWARP.CONFIG                OUTPUT {OUTPUT}.pswarp.mdc               TEXT            NONE       FPA        TRUE      NONE
 PSWARP.OUTPUT.UNCOMPRESSED   OUTPUT {OUTPUT}.fits                     IMAGE           NONE       FPA        TRUE      NONE
+PSWARP.OUTPUT.BKGMODEL       OUTPUT {OUTPUT}.mdl.fits                 IMAGE           NONE       FPA        TRUE      NONE
                                                                                                    
 SKYCELL.STATS                OUTPUT {OUTPUT}.stats                    STATS           NONE       FPA        TRUE      NONE
@@ -333 +336 @@
 PPSTACK.OUTPUT.JPEG1         OUTPUT {OUTPUT}.b1.jpg                   JPEG            NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.JPEG2         OUTPUT {OUTPUT}.b2.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGMODEL      OUTPUT {OUTPUT}.mdl.fits                 IMAGE           NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGREST       OUTPUT {OUTPUT}.bkgrest.fits             IMAGE           NONE       FPA        TRUE      NONE
 PPSTACK.CONFIG               OUTPUT {OUTPUT}.ppStack.mdc              TEXT            NONE       FPA        TRUE      NONE
 
@@ -360 +365 @@
 PPSKYCELL.JPEG1              OUTPUT {OUTPUT}.0.b1.jpeg     JPEG            NONE       CHIP       TRUE      NONE
 PPSKYCELL.JPEG2              OUTPUT {OUTPUT}.0.b2.jpeg     JPEG            NONE       CHIP       TRUE      NONE
-PPSKYCELL.BIN1          OUTPUT {OUTPUT}.0.b1.fits     IMAGE     COMP_IMG       FPA        TRUE      NONE
-PPSKYCELL.BIN2          OUTPUT {OUTPUT}.0.b2.fits     IMAGE     COMP_IMG       FPA       TRUE      NONE
+PPSKYCELL.BIN1               OUTPUT {OUTPUT}.b1.fits     IMAGE     COMP_IMG       FPA        TRUE      NONE
+PPSKYCELL.BIN2               OUTPUT {OUTPUT}.b2.fits     IMAGE     COMP_IMG       FPA       TRUE      NONE
+PPSKYCELL.BIN1.MASK          OUTPUT {OUTPUT}.b1.mk.fits     MASK     COMP_MASK       FPA        TRUE      NONE
+PPSKYCELL.BIN2.MASK          OUTPUT {OUTPUT}.b2.mk.fits     MASK     COMP_MASK       FPA       TRUE      NONE
 
 LOG.IMFILE                   OUTPUT {OUTPUT}.{CHIP.NAME}.log          TEXT            NONE       CHIP       TRUE      NONE

branches/eam_branches/ipp-20121130/ippconfig/recipes/jpeg.mdc

@@ -260 +260 @@
         SCALE.MIN       F32      -8.0
         SCALE.MAX       F32      +8.0
-        OPTIONS         STR     +SB,-X,+Y
+        OPTIONS         STR     +SB,+X,+Y
 END
 
@@ -268 +268 @@
         SCALE.MIN       F32      -8.0
         SCALE.MAX       F32      +8.0
-        OPTIONS         STR     -SB,-X,+Y
+        OPTIONS         STR     -SB,+X,+Y
 END
 

branches/eam_branches/ipp-20121130/ippconfig/recipes/nightly_science.config

@@ -229 +229 @@
   DIFFABLE  BOOL TRUE
   REDUCTION STR SWEETSPOT
+  ADDITIONAL_STACK_LABEL STR ecliptic.rp
 #  REDUCTION STR SSTF_4SIG
 #  WARP      S16 60
@@ -240 +241 @@
   DIFFABLE    BOOL TRUE
   REDUCTION STR SWEETSPOT
+  ADDITIONAL_STACK_LABEL STR ecliptic.rp
 #  REDUCTION STR SSTF_4SIG
 END
@@ -250 +252 @@
   DIFFABLE    BOOL TRUE
   REDUCTION STR SWEETSPOT
+  ADDITIONAL_STACK_LABEL STR ecliptic.rp
 #  REDUCTION STR SSTF_4SIG
 END
@@ -260 +263 @@
   DIFFABLE    BOOL TRUE
   REDUCTION STR SWEETSPOT
+  ADDITIONAL_STACK_LABEL STR ecliptic.rp
 #  REDUCTION STR SSTF_4SIG
 END

branches/eam_branches/ipp-20121130/ippconfig/recipes/ppBackground.mdc

@@ -1 +1 @@
 # Recipe options for ppBackground
 
+BINNING_RECIPE  STR     PSPHOT
+BINNING_XNAME   STR     BACKGROUND.XBIN
+BINNING_YNAME   STR     BACKGROUND.YBIN
+
+DEFAULT    METADATA
+END
+
+
+STACK       METADATA
+  BINNING_RECIPE        STR     PSWARP
+  BINNING_XNAME STR     BKG.XGRID       
+  BINNING_YNAME STR     BKG.YGRID
+END
+            
 
 BACKGROUND       METADATA

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

@@ -103 +103 @@
 STACK.TYPE      STR     DEEP_STACK
 
+DEFAULT.EXPTIME  F32    NAN
+
 # Recipe overrides for STACK
 STACK   METADATA

branches/eam_branches/ipp-20121130/ippconfig/recipes/ppStats.config

@@ -127 +127 @@
   HEADER        STR     IMAGE_V
   HEADER        STR     STREAK_V
+  
+  HEADER        STR     NDET            # sources->n
+  HEADER        STR     NDET_EXT
+  HEADER        STR     NDET_FRC
 
   ANALYSIS      MULTI   # metadata blocks to search in chip/cell/readout->analysis

branches/eam_branches/ipp-20121130/ippconfig/recipes/ppStatsFromMetadata.config

@@ -544 +544 @@
   ENTRY  VAL  DT_ASTR             F32  CONSTANT         -dtime_astrom      
   ENTRY  VAL  NASTRO              S32  CONSTANT         -n_astrom          
+  ENTRY  VAL  NDET                S32  CONSTANT         -n_detections
+  ENTRY  VAL  NDET_EXT            S32  CONSTANT         -n_extended
+  ENTRY  VAL  NDET_FRC            S32  CONSTANT         -n_forced
 
   ENTRY  VAL  ZPT_OBS             F32  CONSTANT         -zpt_obs

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

@@ -345 +345 @@
 PSPHOT.EXT.NSIGMA.LIMIT             F32   3.0  # sources with extNsigma greater that this get tagged as likely extended sources
 PSPHOT.EXT.NSIGMA.MOMENTS           F32   3.0  # sources with extNsigma greater that this get tagged as likely extended sources
+PSPHOT.EXT.DIFF.ALTERNATE           BOOL  FALSE           # use alternate extended source calculation; designed for diff trails
+PSPHOT.EXT.DIFF.ALTERNATE.THRESH    F32   1.5             # threshold for alternate extended source calculations
 PSPHOT.CR.GROW                      S32   1               # Number of pixels to grow CR mask
 PSPHOT.CR.NSIGMA.SOFTEN             F32   0.0025          # Softening parameter for weights
@@ -382 +384 @@
 # Note: if an input has a filter not in this list it will be processed after all of the others with MATCH.ALL = FALSE
 PSPHOT.STACK.MATCH.FILTERS   METADATA
-    TYPE        PSPHOT_STACK.MATCH.FILTER FILTER.ID ORDER MATCH.ALL
-    gband       PSPHOT_STACK.MATCH.FILTER   g        4       FALSE
-    rband       PSPHOT_STACK.MATCH.FILTER   r        2       FALSE
-    iband       PSPHOT_STACK.MATCH.FILTER   i        1       FALSE
-    zband       PSPHOT_STACK.MATCH.FILTER   z        3       FALSE
-    yband       PSPHOT_STACK.MATCH.FILTER   y        5       TRUE
-    wband       PSPHOT_STACK.MATCH.FILTER   w        0       FALSE
+    TYPE        PSPHOT_STACK.MATCH.FILTER FILTER.ID ORDER MATCH.ALL Y.RATIO.MAX
+    gband       PSPHOT_STACK.MATCH.FILTER   g        4       FALSE      0
+    rband       PSPHOT_STACK.MATCH.FILTER   r        2       FALSE      1.7
+    iband       PSPHOT_STACK.MATCH.FILTER   i        1       FALSE      1.6
+    zband       PSPHOT_STACK.MATCH.FILTER   z        3       FALSE      1.65
+    yband       PSPHOT_STACK.MATCH.FILTER   y        5       TRUE       0
+    wband       PSPHOT_STACK.MATCH.FILTER   w        0       FALSE      0
 END
 

branches/eam_branches/ipp-20121130/ippconfig/recipes/pswarp.config

@@ -19 +19 @@
 MASKSTAT.ADVISORY   U32 0x080
 
+BACKGROUND.MODEL    BOOL   FALSE             # Construct a warped version of the chip stage background
+BKG.XGRID              S32    4               # These need to be tuned
+BKG.YGRID              S32    4
 
 # Default recipe for warping