Changeset 30678

Timestamp:

Feb 17, 2011, 3:23:29 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

Location:

branches/eam_branches/ipp-20110213/ippconfig

Files:

• gpc1/ppStack.config (modified) (1 diff)
• recipes/fitstypes.mdc (modified) (1 diff)
• recipes/ppStack.config (modified) (1 diff)
• recipes/reductionClasses.mdc (modified) (1 diff)

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

@@ -20 +20 @@
 PS1_REFERENCE METADATA
     OUTPUT.NOCOMP   BOOL    TRUE
+    OUTPUT.LOGFLUX  BOOL    FALSE
 END
+
+STACK_DEEP    METADATA
+    OUTPUT.NOCOMP   BOOL    TRUE
+    OUTPUT.LOGFLUX  BOOL    FALSE
+END
+
+STACK_NIGHTLY  METADATA
+    OUTPUT.NOCOMP   BOOL    FALSE
+    OUTPUT.LOGFLUX  BOOL    FALSE
+END
+
+STACK_THREEPI  METADATA
+    OUTPUT.NOCOMP   BOOL    FALSE
+    OUTPUT.LOGFLUX  BOOL    TRUE
+END

branches/eam_branches/ipp-20110213/ippconfig/recipes/fitstypes.mdc

@@ -98 +98 @@
         NOISE           S32     8
 END
+# Compressed log flux image for stacks.
+COMP_STACK     METADATA
+        BITPIX          S32     16
+        SCALING         STR     LOG_STDEV_POSITIVE
+        STDEV.BITS      S32     4
+        STDEV.NUM       F32     10
+        COMPRESSION     STR     RICE
+        TILE.X          S32     0
+        TILE.Y          S32     1
+        TILE.Z          S32     1
+        NOISE           S32     8
+END
 
 # Compressed exposure image

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

@@ -112 +112 @@
         PHOTOMETRY          BOOL  FALSE           # Do basic photometry?
 END
+
+
+# 
+
+STACK_DEEP    METADATA
+END
+
+STACK_NIGHTLY  METADATA
+END
+
+STACK_THREEPI  METADATA
+END

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

@@ -192 +192 @@
         JPEG_BIN1       STR     PPIMAGE_J1
         JPEG_BIN2       STR     PPIMAGE_J2
+END
+
+# reduction classes for different stacks
+# regular stacks
+NIGHTLY_STACK         METADATA
+      STACK_PPSTACK   STR      STACK_NIGHTLY
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
+# deep stacks
+DEEP_STACK            METADATA
+      STACK_PPSTACK   STR      STACK_DEEP
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
+# three pi stacks
+THREEPI_STACK         METADATA
+      STACK_PPSTACK   STR      STACK_THREEPI
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
 END