Changeset 36677 for branches/eam_branches/ipp-20140402/ippconfig

Timestamp:

Apr 20, 2014, 5:52:37 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140402

Files:

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

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

@@ -167 +167 @@
     PSF.TARGET.AS.MAX  BOOL  TRUE
     PSF.TARGET.AS.MAX.EPSILON F32 0.1
+    THRESHOLD.MASK  F32     0.01             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     2.5             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
 END
 
@@ -183 +189 @@
     PSF.TARGET.AS.MAX  BOOL  TRUE
     PSF.TARGET.AS.MAX.EPSILON F32 0.1
+    THRESHOLD.MASK  F32     0.5             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     3.5             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
+END
+
+STACK_MDTHREEPI_DEEP_1DG     METADATA   ## revised config for MD+3PI 
+    OUTPUT.NOCOMP           BOOL  TRUE
+    OUTPUT.LOGFLUX          BOOL  FALSE
+    OUTPUT.REPLICATE        BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   10.0    #
+    PSF.INPUT.CLIP.NSIGMA   F32   100.0
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+    MATCH.REJ               F32   4.0     # need ot tune?
+    SAFE                    BOOL  FALSE
+    PSF.TARGET.AS.MAX  BOOL  TRUE
+    PSF.TARGET.AS.MAX.EPSILON F32 0.1
+    THRESHOLD.MASK  F32     0.01             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     2.5             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
 END
 

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

@@ -3 +3 @@
   MODE           STR CHIP
   COMMAND        STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME U16 7
+  RETENTION_TIME U16 5 
 END
 CLEAN_MODES METADATA
@@ -9 +9 @@
   COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
 #  COMMAND        STR true
-  RETENTION_TIME U16 7
+  RETENTION_TIME U16 5
 END
 CLEAN_MODES METADATA
   MODE           STR DIFF
   COMMAND        STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
-  RETENTION_TIME S16 7
+  RETENTION_TIME S16 5
 END
 CLEAN_MODES METADATA

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

@@ -189 +189 @@
 END
 
+STACK_MDTHREEPI_DEEP_1DG   METADATA
+END
+
 
 

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

@@ -491 +491 @@
   PEAKS_NMAX_TOTAL                    S32   0 # set this to limit the allowed number of peaks - Yields fault instead of avoid memory explosion
 
-  EXT_MODEL_TYPE_FOR_CFF              STR   PS_MODEL_DEV
+#  EXT_MODEL_TYPE_FOR_CFF              STR   PS_MODEL_DEV
 
   SAVE.RESID                          BOOL  TRUE

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

@@ -663 +663 @@
       STACKPHOT_SINGLE_PSPHOT STR     STACKPHOT_SINGLE
       STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL 
+END
+
+MDTHREEPI_DEEP_STACK_1DG            METADATA
+      STACK_PPSTACK           STR     STACK_MDTHREEPI_DEEP_1DG
+      STACK_PPSUB             STR     STACK_1DG
+      STACK_PSPHOT            STR     STACK
+      STACKPHOT_PSPHOT        STR     STACKPHOT
+      STACKPHOT_PPSUB         STR     STACKPHOT_1DG
+      STACKPHOT_PPSTACK       STR     STACKPHOT
+      STACKPHOT_SINGLE_PSPHOT STR     STACKPHOT_SINGLE
+      STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL
 END