Changeset 29767

Timestamp:

Nov 12, 2010, 4:10:44 PM (15 years ago)

Author:

bills

Message:

create new ppStack recipe that does not compress the output files

Location:

tags/ipp-20101029

Files:

• ippScripts/scripts/stack_skycell.pl (modified) (2 diffs, 1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/recipes/filerules-split.mdc (modified) (2 diffs)
• ippconfig/recipes/fitstypes.mdc (modified) (1 diff)
• ippconfig/recipes/nightly_science.config (modified) (1 prop)
• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 diff, 1 prop)

tags/ipp-20101029/ippScripts/scripts/stack_skycell.pl

@@ -171 +171 @@
 my $convolve = metadataLookupBool($recipe, 'CONVOLVE'); # Convolve inputs?
 my $photometry = metadataLookupBool($recipe, 'PHOTOMETRY'); # perform photometry?
+my $output_nocomp = metadataLookupBool($recipe, 'OUTPUT.NOCOMP'); # change filerules to produced uncompressed output images
 
 
@@ -243 +244 @@
     $command .= " -F SOURCE.PLOT.PSFMODEL SOURCE.PLOT.SKY.PSFMODEL";
     $command .= " -F SOURCE.PLOT.APRESID SOURCE.PLOT.SKY.APRESID";
+    if ($output_nocomp) {
+        $command .= " -F PPSTACK.OUTPUT PPSTACK.OUTPUT.NOCOMP";
+        $command .= " -F PPSTACK.OUTPUT.VARIANCE PPSTACK.OUTPUT.VARIANCE.NOCOMP";
+        $command .= " -F PPSTACK.OUTPUT.EXPWT PPSTACK.OUTPUT.EXPWT.NOCOMP";
+        $command .= " -F PPSTACK.UNCONV PPSTACK.UNCONV.NOCOMP";
+        $command .= " -F PPSTACK.UNCONV.VARIANCE PPSTACK.UNCONV.VARIANCE.NOCOMP";
+        $command .= " -F PPSTACK.UNCONV.EXPWT PPSTACK.UNCONV.EXPWT.NOCOMP";
+    }
     $command .= " -threads $threads" if defined $threads;
     $command .= " -debug-stack" if defined $debug;

tags/ipp-20101029/ippconfig/gpc1/ppStack.config

@@ -17 +17 @@
         w.00000       F32     25.0
 END
+
+PS1_REFERENCE METADATA
+    OUTPUT.NOCOMP   BOOL    TRUE
+END

tags/ipp-20101029/ippconfig/recipes/filerules-split.mdc

@@ -16 +16 @@
 # PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL
 # PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF
+
+# ppstack default to compressed images
+PPSTACK.OUTPUT           STR PPSTACK.OUTPUT.COMP
+PPSTACK.OUTPUT.MASK      STR PPSTACK.OUTPUT.MASK.COMP
+PPSTACK.OUTPUT.VARIANCE  STR PPSTACK.OUTPUT.VARIANCE.COMP
+PPSTACK.OUTPUT.EXPWT     STR PPSTACK.OUTPUT.EXPWT.COMP
+PPSTACK.UNCONV.OUTPUT    STR PPSTACK.UNCONV.COMP
+PPSTACK.UNCONV.MASK      STR PPSTACK.UNCONV.MASK.COMP
+PPSTACK.UCONV.VARIANCE   STR PPSTACK.UNCONV.VARIANCE.COMP
+PPSTACK.UNCONV.EXPWT     STR PPSTACK.UNCONV.EXPWT.COMP
 
 ### input file definitions
@@ -261 +271 @@
 PPSUB.REF.CONV.VARIANCE      OUTPUT {OUTPUT}.refConv.wt.fits          VARIANCE        COMP_WT    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}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.COMP          OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTACK.OUTPUT.NOCOMP        OUTPUT {OUTPUT}.fits                     IMAGE           NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.MASK.COMP     OUTPUT {OUTPUT}.mask.fits                MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTACK.OUTPUT.MASK.NOCCOMP  OUTPUT {OUTPUT}.mask.fits                MASK            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.VARIANCE.COMP OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.VARIANCE.NOCOMP OUTPUT {OUTPUT}.wt.fits                  VARIANCE        NONE    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.OUTPUT.EXPWT.COMP    OUTPUT {OUTPUT}.expwt.fits               VARIANCE        EXP        FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPWT.NOCOMP  OUTPUT {OUTPUT}.expwt.fits               VARIANCE        NONE       FPA        TRUE      NONE
+PPSTACK.UNCONV.COMP          OUTPUT {OUTPUT}.unconv.fits              IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTACK.UNCONV.NOCOMP        OUTPUT {OUTPUT}.unconv.fits              IMAGE           NONE       FPA        TRUE      NONE
+PPSTACK.UNCONV.MASK.COMP     OUTPUT {OUTPUT}.unconv.mask.fits         MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTACK.UNCONV.MASK.NOCOMP   OUTPUT {OUTPUT}.unconv.mask.fits         MASK            NONE       FPA        TRUE      NONE
+PPSTACK.UNCONV.VARIANCE.COMP OUTPUT {OUTPUT}.unconv.wt.fits           VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.UNCONV.VARIANCE.NOCOMP OUTPUT {OUTPUT}.unconv.wt.fits         VARIANCE        NONE       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.UNCONV.EXPWT.COMP    OUTPUT {OUTPUT}.unconv.expwt.fits        VARIANCE        EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPWT.NOCOMP  OUTPUT {OUTPUT}.unconv.expwt.fits        VARIANCE        NONE       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

tags/ipp-20101029/ippconfig/recipes/fitstypes.mdc

@@ -108 +108 @@
         BZERO           F32     3276.8  # Store unsigned zero as zero
         # switch to NONE to work around ticket 1411
-        #COMPRESSION    STR     NONE
-        COMPRESSION     STR     GZIP
+        COMPRESSION     STR     NONE
+        #COMPRESSION    STR     GZIP
         TILE.X          S32     0
         TILE.Y          S32     1

tags/ipp-20101029/ippconfig/recipes/ppStack.config

@@ -88 +88 @@
 TEMP.DELETE     BOOL    TRUE            # Delete temporary files on completion?
 
+OUTPUT.NOCOMP   BOOL    FALSE           # use filerules that make conconpressed outputs
+
 # Recipe overrides for STACK
 STACK   METADATA
+END
+#
+PS1_REFERENCE   METADATA
 END
 

tags/ipp-20101029/ippconfig/recipes/reductionClasses.mdc

@@ -250 +250 @@
         CHIP_PSPHOT     STR     CHIP
         WARP_PSWARP     STR     WARP
-        STACK_PPSTACK   STR     STACK
+        STACK_PPSTACK   STR     PS1_REFERENCE
         STACK_PPSUB     STR     STACK
         STACK_PSPHOT    STR     STACK