Index: trunk/ippScripts/scripts/detrend_process_imfile.pl =================================================================== --- trunk/ippScripts/scripts/detrend_process_imfile.pl (revision 23182) +++ trunk/ippScripts/scripts/detrend_process_imfile.pl (revision 23183) @@ -81,4 +81,24 @@ my $jpeg_recipe = $ipprc->reduction($reduction, uc($det_type) . '_JPEG_IMAGE'); # Recipe name for JPEG +# The output file rule name depends on the detrend type +my $FILERULES = { 'FLATMASK' => undef, + 'DARKMASK' => undef, + 'MASK' => undef, + 'BIAS' => undef, + 'DARK' => undef, + 'DARK_PREMASK' => undef, + 'SHUTTER' => 'PPIMAGE.OUTPUT.DETREND', + 'FLAT_PREMASK' => 'PPIMAGE.OUTPUT.DETREND', + 'DOMEFLAT_PREMASK' => 'PPIMAGE.OUTPUT.DETREND', + 'SKYFLAT_PREMASK' => 'PPIMAGE.OUTPUT.DETREND', + 'FLAT_RAW' => 'PPIMAGE.OUTPUT.DETREND', + 'DOMEFLAT_RAW' => 'PPIMAGE.OUTPUT.DETREND', + 'SKYFLAT_RAW' => 'PPIMAGE.OUTPUT.DETREND', + 'FLAT' => 'PPIMAGE.OUTPUT.DETREND', + 'DOMEFLAT' => 'PPIMAGE.OUTPUT.DETREND', + 'SKYFLAT' => 'PPIMAGE.OUTPUT.DETREND', + 'FRINGE' => undef, + }; + &my_die("Couldn't find input file: $input_uri\n", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri); @@ -105,4 +125,6 @@ $command .= " -recipe PPSTATS DETSTATS"; $command .= " -stats $outputStats"; + $command .= " -F PPIMAGE.OUTPUT $FILERULES{$det_type}" if defined $FILERULES{$det_type}; + $command .= " -tracedest $traceDest -log $logDest"; $command .= " -threads $threads" if defined $threads; Index: trunk/ippScripts/scripts/detrend_resid_imfile.pl =================================================================== --- trunk/ippScripts/scripts/detrend_resid_imfile.pl (revision 23182) +++ trunk/ippScripts/scripts/detrend_resid_imfile.pl (revision 23183) @@ -124,4 +124,24 @@ }; +# The output file rule name depends on the detrend type +my $FILERULES = { 'FLATMASK' => 'PPIMAGE.OUTPUT.RESID', + 'DARKMASK' => 'PPIMAGE.OUTPUT.RESID', + 'MASK' => 'PPIMAGE.OUTPUT.RESID', + 'BIAS' => 'PPIMAGE.OUTPUT.RESID', + 'DARK' => 'PPIMAGE.OUTPUT.RESID', + 'DARK_PREMASK' => 'PPIMAGE.OUTPUT.RESID', + 'SHUTTER' => 'PPIMAGE.OUTPUT.DETREND', + 'FLAT_PREMASK' => 'PPIMAGE.OUTPUT.DETREND', + 'DOMEFLAT_PREMASK' => 'PPIMAGE.OUTPUT.DETREND', + 'SKYFLAT_PREMASK' => 'PPIMAGE.OUTPUT.DETREND', + 'FLAT_RAW' => 'PPIMAGE.OUTPUT.DETREND', + 'DOMEFLAT_RAW' => 'PPIMAGE.OUTPUT.DETREND', + 'SKYFLAT_RAW' => 'PPIMAGE.OUTPUT.DETREND', + 'FLAT' => 'PPIMAGE.OUTPUT.DETREND', + 'DOMEFLAT' => 'PPIMAGE.OUTPUT.DETREND', + 'SKYFLAT' => 'PPIMAGE.OUTPUT.DETREND', + 'FRINGE' => 'PPIMAGE.OUTPUT.RESID', + }; + # outroot examples (HOST components must be set) # file://data/ipp004.0/gpc1/20080130 @@ -149,5 +169,5 @@ $command .= " -recipe JPEG $jpeg_recipe"; $command .= " -recipe PPSTATS RESIDUAL"; - $command .= " -F PPIMAGE.OUTPUT PPIMAGE.OUTPUT.RESID"; + $command .= " -F PPIMAGE.OUTPUT $FILERULES{$det_type}" if defined $FILERULES{$det_type}; $command .= " -stats $outputStats"; $command .= " -tracedest $traceDest -log $logDest"; Index: trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-mef.mdc (revision 23182) +++ trunk/ippconfig/recipes/filerules-mef.mdc (revision 23183) @@ -128,4 +128,5 @@ PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE NONE CHIP TRUE SPLIT PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE MASK CHIP TRUE MEF +PPIMAGE.OUTPUT.DETREND OUTPUT {OUTPUT}.fits IMAGE COMP_DET CHIP TRUE MEF PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.b0.fits IMAGE COMP_SUB CHIP TRUE MEF PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE Index: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 23182) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 23183) @@ -91,4 +91,5 @@ PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE NONE FPA TRUE SIMPLE PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.OUTPUT.DETREND OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE PPIMAGE.CONFIG OUTPUT {OUTPUT}.ppImage.mdc TEXT NONE FPA TRUE NONE Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 23182) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 23183) @@ -100,11 +100,7 @@ PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE COMP_WT CHIP TRUE NONE PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE DET_MASK CHIP TRUE NONE +PPIMAGE.OUTPUT.DETREND OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_DET CHIP TRUE NONE PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_SUB CHIP TRUE NONE PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE - -#PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE -#PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE NONE -#PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE NONE CHIP TRUE NONE -#PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE COMP_IMG CHIP TRUE NONE @@ -124,7 +120,7 @@ PPIMAGE.STATS OUTPUT {OUTPUT}.{CHIP.NAME}.stats STATS NONE CHIP TRUE NONE - + ## note: these use the same output naming convention since they are used for different ppMerge runs -PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits MASK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits MASK DET_MASK CHIP TRUE NONE PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.{CHIP.NAME}.fits DARK NONE CHIP TRUE NONE Index: trunk/ippconfig/recipes/fitstypes.mdc =================================================================== --- trunk/ippconfig/recipes/fitstypes.mdc (revision 23182) +++ trunk/ippconfig/recipes/fitstypes.mdc (revision 23183) @@ -19,4 +19,17 @@ # STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE) # FLOAT(STR) is the name of a custom floating-point type + +# Compressed detrend +COMP_FLAT METADATA + BITPIX S32 16 + SCALING STR MANUAL + BSCALE F32 1.0 + BZERO F32 32768.0 + COMPRESSION STR RICE + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 +END DET_IMAGE METADATA