Changeset 35350 for branches/eam_branches/ipp-20130307/ippconfig

Timestamp:

Apr 2, 2013, 3:01:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

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

branches/eam_branches/ipp-20130307/ippconfig/gpc1/ppImage.config

@@ -1232 +1232 @@
   BIAS               BOOL    FALSE           # Bias subtraction
   DARK               BOOL    TRUE            # Dark subtraction
+  NOISEMAP           BOOL    FALSE
   REMNANCE           BOOL    FALSE           # Remnance masking
   SHUTTER            BOOL    FALSE           # Shutter correction

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

@@ -56 +56 @@
 END
 
+STACK_ALLDEEP    METADATA                  # N>>20 inputs, typically MD fields, no cuts
+    OUTPUT.NOCOMP           BOOL  TRUE
+    OUTPUT.LOGFLUX          BOOL  FALSE
+    OUTPUT.REPLICATE        BOOL  TRUE
+END
+
 # Recipe overrides for STACK
 STACKPHOT METADATA

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

@@ -159 +159 @@
 END
 
+STACK_ALLDEEP   METADATA
+END
+
 TEST1 METADATA
   PSF.AUTOSIZE    BOOL  FALSE           # Determine output PSF size from input PSFs?

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

@@ -563 +563 @@
   ENTRY  VAL  ZPT_ERR             F32  CONSTANT         -zpt_stdev
   # don't know why these come out as F64 instead of F32
-  ENTRY  VAL  FWHM_MAJ            F64  CONSTANT         -fhwm_major
-  ENTRY  VAL  FWHM_MIN            F64  CONSTANT         -fhwm_minor
+  ENTRY  VAL  FWHM_MAJ            F64  CONSTANT         -fwhm_major
+  ENTRY  VAL  FWHM_MIN            F64  CONSTANT         -fwhm_minor
 
   ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag

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

@@ -550 +550 @@
        STACK_PPSUB     STR      STACK
        STACK_PSPHOT    STR      STACK
+END
+
+# all/deep stacks
+ALLDEEP_STACK            METADATA
+        STACK_PPSTACK           STR     STACK_ALLDEEP
+        STACK_PPSUB             STR     STACK
+        STACK_PSPHOT            STR     STACK
+        STACKPHOT_PSPHOT        STR     STACKPHOT
+        STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL
 END