Changeset 27417 for trunk/ippconfig/recipes

Timestamp:

Mar 23, 2010, 3:23:07 PM (16 years ago)

Author:

Paul Price

Message:

Merging development branch branches/pap_stack/ (exposure maps and their compression).

Location:

trunk

Files:

• . (modified) (1 prop)
• ippconfig/recipes/filerules-mef.mdc (modified) (1 diff)
• ippconfig/recipes/filerules-simple.mdc (modified) (1 diff)
• ippconfig/recipes/filerules-split.mdc (modified) (1 diff)
• ippconfig/recipes/fitstypes.mdc (modified) (1 diff)

trunk/ippconfig/recipes/filerules-mef.mdc

@@ -265 +265 @@
 PPSTACK.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits                  MASK      COMP_MASK  FPA        TRUE      NONE
 PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXP      OUTPUT {OUTPUT}.exp.fits                 IMAGE     EXP        FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPNUM   OUTPUT {OUTPUT}.num.fits                 MASK      EXPNUM     FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPWT    OUTPUT {OUTPUT}.expwt.fits               VARIANCE  EXP        FPA        TRUE      NONE
 PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits              IMAGE     COMP_IMG   FPA        TRUE      NONE
 PPSTACK.UNCONV.MASK     OUTPUT {OUTPUT}.unconv.mask.fits         MASK      COMP_MASK  FPA        TRUE      NONE
 PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits           VARIANCE  COMP_WT    FPA        TRUE      NONE
+PPSTACK.UNCONV.EXP      OUTPUT {OUTPUT}.unconv.exp.fits          IMAGE     EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPNUM   OUTPUT {OUTPUT}.unconv.num.fits          MASK      EXPNUM     FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPWT    OUTPUT {OUTPUT}.unconv.expwt.fits        VARIANCE  EXP        FPA        TRUE      NONE
 PPSTACK.TARGET.PSF      OUTPUT {OUTPUT}.target.psf               PSF       NONE       CHIP       TRUE      NONE
 PPSTACK.CONV.KERNEL     OUTPUT {OUTPUT}.{FILE.INDEX}.kernel      SUBKERNEL NONE       FPA        TRUE      NONE

trunk/ippconfig/recipes/filerules-simple.mdc

@@ -211 +211 @@
 PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE NONE     FPA        TRUE      NONE
                                              
-PPSTACK.OUTPUT          OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      NONE
-PPSTACK.OUTPUT.MASK     OUTPUT {OUTPUT}.mask.fits    MASK      NONE       FPA        TRUE      NONE
-PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.weight.fits  VARIANCE  NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT          OUTPUT {OUTPUT}.fits         IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPSTACK.OUTPUT.MASK     OUTPUT {OUTPUT}.mask.fits    MASK      COMP_MASK  FPA        TRUE      NONE
+PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.weight.fits  VARIANCE  COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXP      OUTPUT {OUTPUT}.exp.fits     IMAGE     EXP        FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPNUM   OUTPUT {OUTPUT}.num.fits     MASK      EXPNUM     FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPWT    OUTPUT {OUTPUT}.expwt.fits   VARIANCE  EXP        FPA        TRUE      NONE
 PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits  IMAGE     COMP_IMG   FPA        TRUE      NONE
 PPSTACK.UNCONV.MASK     OUTPUT {OUTPUT}.unconv.mask.fits MASK  COMP_MASK  FPA        TRUE      NONE
 PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE COMP_WT   FPA        TRUE      NONE
+PPSTACK.UNCONV.EXP      OUTPUT {OUTPUT}.unconv.exp.fits IMAGE  EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPNUM   OUTPUT {OUTPUT}.unconv.num.fits MASK   EXPNUM     FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPWT    OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE EXP    FPA        TRUE      NONE
 PPSTACK.TARGET.PSF      OUTPUT {OUTPUT}.target.psf   PSF       NONE       CHIP       TRUE      NONE
 PPSTACK.CONV.KERNEL     OUTPUT {OUTPUT}.{FILE.INDEX}.kernel SUBKERNEL NONE FPA       TRUE      NONE

trunk/ippconfig/recipes/filerules-split.mdc

@@ -233 +233 @@
 PPSTACK.OUTPUT.MASK     OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA        TRUE      NONE
 PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXP      OUTPUT {OUTPUT}.exp.fits                 IMAGE     EXP        FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPNUM   OUTPUT {OUTPUT}.num.fits                 MASK      EXPNUM     FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPWT    OUTPUT {OUTPUT}.expwt.fits               VARIANCE  EXP        FPA        TRUE      NONE
 PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits              IMAGE     COMP_IMG   FPA        TRUE      NONE
 PPSTACK.UNCONV.MASK     OUTPUT {OUTPUT}.unconv.mask.fits         MASK      COMP_MASK  FPA        TRUE      NONE
 PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits           VARIANCE  COMP_WT    FPA        TRUE      NONE
+PPSTACK.UNCONV.EXP      OUTPUT {OUTPUT}.unconv.exp.fits          IMAGE     EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPNUM   OUTPUT {OUTPUT}.unconv.num.fits          MASK      EXPNUM     FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPWT    OUTPUT {OUTPUT}.unconv.expwt.fits        VARIANCE  EXP        FPA        TRUE      NONE
 PPSTACK.TARGET.PSF      OUTPUT {OUTPUT}.target.psf               PSF       NONE       CHIP       TRUE      NONE
 PPSTACK.CONV.KERNEL     OUTPUT {OUTPUT}.{FILE.INDEX}.kernel      SUBKERNEL NONE       FPA        TRUE      NONE

trunk/ippconfig/recipes/fitstypes.mdc

@@ -99 +99 @@
 END
 
+# Compressed exposure image
+EXP     METADATA
+        BITPIX          S32     16
+        SCALING         STR     MANUAL
+        FUZZ            BOOL    FALSE
+        # Note: TRUE = BZERO + BSCALE * DISK
+        BSCALE          F32     0.1     # Disk is stored as 1/10th sec
+        BZERO           F32     3276.8  # Store unsigned zero as zero
+        COMPRESSION     STR     GZIP
+        TILE.X          S32     0
+        TILE.Y          S32     1
+        TILE.Z          S32     1
+        NOISE           S32     8
+END
+
+# Compressed number image
+EXPNUM  METADATA
+        BITPIX          S32     16
+        COMPRESSION     STR     GZIP
+        TILE.X          S32     0
+        TILE.Y          S32     1
+        TILE.Z          S32     1
+        NOISE           S32     8
+END
+