Changeset 35594 for branches/eam_branches/ipp-20130509/ippconfig

Timestamp:

May 24, 2013, 1:37:30 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509

Files:

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

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

@@ -81 +81 @@
 END
 
-STACK_ALLDEEP    METADATA                  # N>>20 inputs, typically MD fields, no cuts
+
+STACK_MD_REF       METADATA  ## revised config for MD refstacks vs PS1_REFERENCE above after ppStack mods 5/03/13
     OUTPUT.NOCOMP           BOOL  TRUE
     OUTPUT.LOGFLUX          BOOL  FALSE
     OUTPUT.REPLICATE        BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK  ## needed?
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   6.0   # never really want >6 pixels in refstack
+    PSF.INPUT.CLIP.NSIGMA   F32   1.0   # sample typically on rising side of distribution (set even smaller?)
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+    MATCH.REJ               F32   4.0 # need ot tune?
+    SAFE                    BOOL  FALSE
+END
+
+STACK_MD_DEEP     METADATA   ## revised config for MD deepstack above after ppStack mods 5/03/13
+    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
+END
+
+STACK_ALLDEEP      METADATA     # no cuts, everything in changes after ppStack mods 5/03/13
+    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   100.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
 END
 

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

@@ -164 +164 @@
 END
 
+STACK_MD_REF    METADATA
+END
+
+STACK_MD_DEEP   METADATA
+END
+
 STACK_ALLDEEP   METADATA
 END
+
+
+
 
 TEST1 METADATA

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

@@ -108 +108 @@
 END
 
+# test setup for nodual case
+DIFF_NODUAL    METADATA   
+        DUAL             BOOL    FALSE    # Dual convolution?
+        INVERSE          BOOL    TRUE    # Generate inverse subtraction?
+        PHOTOMETRY       BOOL    TRUE    # Perform photometry?
+        CONVOLVE.TARGET  STR     SINGLE_AUTO
+
+        @ISIS.WIDTHS    F32     1.5  3.0  6.0   # Gaussian kernel FWHM values
+        @ISIS.ORDERS    S32     6    4    2     # Polynomial orders for ISIS kernels
+
+        SCALE.REF       F32     5.0             # FWHM reference for kernel parameter scaling
+        KERNEL.SIZE     S32     20              # Kernel half-size (pixels)
+        STAMP.FOOTPRINT S32     20              # Size of stamps (pixels)
+END
+
 # Difference of two warps
 WARPWARP        METADATA

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

@@ -299 +299 @@
 END
 
+# sweetspot no dual test case
+SWEETSPOT_NODUAL            METADATA
+        DIFF_PPSUB        STR     DIFF_NODUAL
+        DIFF_PSPHOT       STR     SSTF_DIFF
+        JPEG_BIN1         STR     PPIMAGE_J1
+        JPEG_BIN2         STR     PPIMAGE_J2
+END
 
 CONSTANT_WEIGHTPHOT             METADATA
@@ -544 +551 @@
 END
 
+## MD refstack
+MD_REF_STACK            METADATA
+      STACK_PPSTACK           STR     STACK_MD_REF
+      STACK_PPSUB             STR     STACK
+      STACK_PSPHOT            STR     STACK
+      STACKPHOT_PSPHOT        STR     STACKPHOT
+      STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL 
+END
+
+## MD deepstack
+MD_DEEP_STACK            METADATA
+      STACK_PPSTACK           STR     STACK_MD_DEEP
+      STACK_PPSUB             STR     STACK
+      STACK_PSPHOT            STR     STACK
+      STACKPHOT_PSPHOT        STR     STACKPHOT
+      STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL 
+END
 
 # quick stacks