Changeset 29906 for branches/eam_branches/ipp-20101103/ippconfig/recipes

Timestamp:

Dec 3, 2010, 2:35:32 AM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101103/ippconfig

Files:

• . (modified) (1 prop)
• recipes/filerules-mef.mdc (modified) (1 diff)
• recipes/filerules-simple.mdc (modified) (2 diffs)
• recipes/filerules-split.mdc (modified) (1 diff)
• recipes/ppStats.config (modified) (1 diff)
• recipes/ppStatsFromMetadata.config (modified) (2 diffs)

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

@@ -319 +319 @@
 LOG.IMFILE              OUTPUT {OUTPUT}.{CHIP.NAME}.log          TEXT      NONE       CHIP       TRUE      NONE
 LOG.EXP                 OUTPUT {OUTPUT}.log                      TEXT      NONE       FPA        TRUE      NONE
+LOG.IMFILE.UPDATE       OUTPUT {OUTPUT}.{CHIP.NAME}.log.update   TEXT      NONE       CHIP       TRUE      NONE
+LOG.EXP.UPDATE          OUTPUT {OUTPUT}.log.update               TEXT      NONE       FPA        TRUE      NONE
                                                                                      
 TRACE.IMFILE            OUTPUT {OUTPUT}.{CHIP.NAME}.trace        TEXT      NONE       CHIP       TRUE      NONE
 TRACE.EXP               OUTPUT {OUTPUT}.trace                    TEXT      NONE       FPA        TRUE      NONE
+TRACE.IMFILE.UPDATE     OUTPUT {OUTPUT}.{CHIP.NAME}.trace.update TEXT      NONE       CHIP       TRUE      NONE
+TRACE.EXP.UPDATE        OUTPUT {OUTPUT}.trace.update             TEXT      NONE       FPA        TRUE      NONE
 
 PPNOISEMAP.OUTPUT       OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE

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

@@ -246 +246 @@
 PPSUB.REF.CONV.VARIANCE      OUTPUT {OUTPUT}.refConv.wt.fits      VARIANCE        NONE       FPA        TRUE      NONE
                                              
+PPSUB.FORCED.SOURCES         OUTPUT {OUTPUT}.frc.cmf              CMF             NONE       FPA        TRUE      NONE
+PPSUB.POS1.SOURCES           OUTPUT {OUTPUT}.pos1.cmf             CMF             NONE       FPA        TRUE      NONE
+PPSUB.POS2.SOURCES           OUTPUT {OUTPUT}.pos2.cmf             CMF             NONE       FPA        TRUE      NONE
+
 PPSTACK.OUTPUT.COMP          OUTPUT {OUTPUT}.fits                 IMAGE           COMP_IMG   FPA        TRUE      NONE
 PPSTACK.OUTPUT.RAW           OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      NONE
@@ -290 +294 @@
 LOG.IMFILE                   OUTPUT {OUTPUT}.imfile.log           TEXT            NONE       FPA        TRUE      NONE
 LOG.EXP                      OUTPUT {OUTPUT}.exp.log              TEXT            NONE       FPA        TRUE      NONE
+LOG.IMFILE.UPDATE            OUTPUT {OUTPUT}.imfile.log.update    TEXT            NONE       FPA        TRUE      NONE
+LOG.EXP.UPDATE               OUTPUT {OUTPUT}.exp.log.update       TEXT            NONE       FPA        TRUE      NONE
 
 TRACE.IMFILE                 OUTPUT {OUTPUT}.imfile.trace         TEXT            NONE       FPA        TRUE      NONE
 TRACE.EXP                    OUTPUT {OUTPUT}.exp.trace            TEXT            NONE       FPA        TRUE      NONE
+TRACE.IMFILE.UPDATE          OUTPUT {OUTPUT}.imfile.trace.update  TEXT            NONE       FPA        TRUE      NONE
+TRACE.EXP.UPDATE             OUTPUT {OUTPUT}.exp.trace.update     TEXT            NONE       FPA        TRUE      NONE
 
 PPNOISEMAP.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits     IMAGE           NONE       CHIP       TRUE      NONE

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

@@ -323 +323 @@
 LOG.IMFILE                   OUTPUT {OUTPUT}.{CHIP.NAME}.log          TEXT            NONE       CHIP       TRUE      NONE
 LOG.EXP                      OUTPUT {OUTPUT}.log                      TEXT            NONE       FPA        TRUE      NONE
+LOG.IMFILE.UPDATE            OUTPUT {OUTPUT}.{CHIP.NAME}.log.update   TEXT            NONE       CHIP       TRUE      NONE
+LOG.EXP.UPDATE               OUTPUT {OUTPUT}.log.update               TEXT            NONE       FPA        TRUE      NONE
                                                                                                               
 TRACE.IMFILE                 OUTPUT {OUTPUT}.{CHIP.NAME}.trace        TEXT            NONE       CHIP       TRUE      NONE
 TRACE.EXP                    OUTPUT {OUTPUT}.trace                    TEXT            NONE       FPA        TRUE      NONE
+TRACE.IMFILE.UPDATE          OUTPUT {OUTPUT}.{CHIP.NAME}.trace.update TEXT            NONE       CHIP       TRUE      NONE
+TRACE.EXP.UPDATE             OUTPUT {OUTPUT}.trace.update             TEXT            NONE       FPA        TRUE      NONE
 
 PPNOISEMAP.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE

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

@@ -84 +84 @@
   HEADER        STR     IQ_M4_LQ
   HEADER        STR     IQ_M4_UQ
+  HEADER        STR     DETEFF.MAGREF
+
 
   HEADER        STR     PSLIB_V

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

@@ -187 +187 @@
   ENTRY VAL MASKFRAC_MAGIC        F32  CONSTANT         -maskfrac_magic
   ENTRY VAL MASKFRAC_ADVISORY     F32  CONSTANT         -maskfrac_advisory
+
+  # Detection Efficiency
+  ENTRY  VAL  DETEFF.MAGREF       F32  CONSTANT         -deteff_magref            
 END
 
@@ -255 +258 @@
   ENTRY  VAL  IMAGE_V             STR  CONSTANT         -ver_ppimage
   ENTRY  VAL  STREAK_V            STR  CONSTANT         -ver_streaks
+
+  # Detection Efficiency
+  ENTRY  VAL  deteff_inst         F64  ROBUST_MEDIAN    -deteff_inst            
+  ENTRY  VAL  deteff_inst         F64  ROBUST_STDEV     -deteff_inst_err            
+  ENTRY  VAL  deteff_inst         F64  UQ               -deteff_inst_uq            
+  ENTRY  VAL  deteff_inst         F64  LQ               -deteff_inst_lq            
 END