Index: /branches/eam_branches/ipp-20110710/ippconfig/gpc1/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/gpc1/ppImage.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/gpc1/ppImage.config (revision 32345) @@ -177,4 +177,60 @@ END +# Chip processing with DARKTEST +CHIP_DARKTEST METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + PATTERN.ROW BOOL TRUE # Row pattern correction + PATTERN.CELL BOOL TRUE # Cell pattern correction + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + + DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + DETTYPE STR DARKTEST + EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + FILTER STR FPA.FILTERID + END + FLATCORR METADATA + FILTER STR FPA.FILTERID + END + FRINGE METADATA + FILTER STR FPA.FILTERID + END + SHUTTER METADATA + END + MASK METADATA + END + ASTROM METADATA + END + NOISEMAP METADATA + END + END +END + CHIP_MASKTEST METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -422,57 +478,4 @@ END -# Chip processing with DARKTEST -CHIP_DARKTEST METADATA - BASE.FITS BOOL FALSE # Save base detrended image? - BASE.MASK.FITS BOOL FALSE # Save base detrended image? - BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? - CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? - OVERSCAN BOOL TRUE # Overscan subtraction - NONLIN BOOL TRUE # apply non-linearity correction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - REMNANCE BOOL FALSE # Remnance masking - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL TRUE # Flat-field normalisation - MASK BOOL TRUE # Mask bad pixels - MASK.BUILD BOOL TRUE # Build internal mask? - MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - FRINGE BOOL FALSE # Fringe subtraction - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? - PHOTOM BOOL TRUE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? - - DETREND.CONSTRAINTS METADATA - BIAS METADATA - END - DARK METADATA - DETTYPE STR DARKTEST - EXPTIME STR FPA.EXPOSURE - END - FLAT METADATA - FILTER STR FPA.FILTERID - END - FLATCORR METADATA - FILTER STR FPA.FILTERID - END - FRINGE METADATA - FILTER STR FPA.FILTERID - END - SHUTTER METADATA - END - MASK METADATA - END - ASTROM METADATA - END - NOISEMAP METADATA - END - END -END # Overscan, bias, dark, shutter Index: /branches/eam_branches/ipp-20110710/ippconfig/gpc1/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/gpc1/ppStack.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/gpc1/ppStack.config (revision 32345) @@ -32,4 +32,15 @@ END +# for just unconvolved and deep stacks +QUICKSTACK_DEEP METADATA + CONVOLVE BOOL FALSE + COMBINE.REJ F32 3.5 # Rejection threshold in combination (sigma). tune? + COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean. tune? + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + PSF.INPUT.MAX F32 8.0 # since not convolved limit, relax? tune? + PSF.INPUT.CLIP.NSIGMA F32 5.0 +END + STACK_NIGHTLY METADATA OUTPUT.NOCOMP BOOL FALSE Index: /branches/eam_branches/ipp-20110710/ippconfig/gpc1/psastro.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/gpc1/psastro.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/gpc1/psastro.config (revision 32345) @@ -347,4 +347,5 @@ LAP_ASTRO METADATA - PSASTRO.CATDIR STR 3PI.20110505.REFCAT -END +# PSASTRO.CATDIR STR 3PI.20110505.REFCAT + PSASTRO.CATDIR STR SYNTH.GRIZY +END Index: /branches/eam_branches/ipp-20110710/ippconfig/gpc1/psphot.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/gpc1/psphot.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/gpc1/psphot.config (revision 32345) @@ -54,2 +54,6 @@ SKY_STAT STR FITTED_MEAN_V4 # statistic used to measure background END + +CHIP_CONSTANT_WEIGHTPHOT METADATA + CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE +END Index: /branches/eam_branches/ipp-20110710/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/recipes/nightly_science.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/recipes/nightly_science.config (revision 32345) @@ -71,5 +71,5 @@ NAME STR M31 DISTRIBUTION STR M31 - TESS STR M31 + TESS STR M31.V4 OBSMODE STR M31 OBJECT STR M31% @@ -82,5 +82,5 @@ NAME STR MD01 DISTRIBUTION STR MD01 - TESS STR MD01.V2 + TESS STR MD01.V3 OBSMODE STR MD OBJECT STR MD01% @@ -93,5 +93,5 @@ NAME STR MD02 DISTRIBUTION STR MD02 - TESS STR MD02.V2 + TESS STR MD02.V3 OBSMODE STR MD OBJECT STR MD02% @@ -181,5 +181,5 @@ NAME STR MD10 DISTRIBUTION STR MD10 - TESS STR MD10.V2 + TESS STR MD10.V3 OBSMODE STR MD OBJECT STR MD10% @@ -210,12 +210,12 @@ REDUCTION STR STS_DATASET # bump the retention times for the time being - CHIP S16 60 - WARP S16 60 - DIFF S16 60 + CHIP S16 700 + WARP S16 700 + DIFF S16 700 END TARGETS METADATA NAME STR SweetSpot DISTRIBUTION STR SweetSpot - TESS STR RINGS.V0 + TESS STR RINGS.V3 OBSMODE STR SS STACKABLE BOOL FALSE @@ -226,5 +226,5 @@ NAME STR OSS DISTRIBUTION STR SweetSpot - TESS STR RINGS.V0 + TESS STR RINGS.V3 OBSMODE STR OSS STACKABLE BOOL FALSE @@ -234,5 +234,5 @@ NAME STR ESS DISTRIBUTION STR SweetSpot - TESS STR RINGS.V0 + TESS STR RINGS.V3 OBSMODE STR ESS STACKABLE BOOL FALSE @@ -242,5 +242,5 @@ NAME STR MSS DISTRIBUTION STR SweetSpot - TESS STR RINGS.V0 + TESS STR RINGS.V3 OBSMODE STR MSS STACKABLE BOOL FALSE @@ -250,5 +250,5 @@ NAME STR PI DISTRIBUTION STR SweetSpot - TESS STR RINGS.V0 + TESS STR RINGS.V3 OBSMODE STR PI STACKABLE BOOL FALSE @@ -266,11 +266,13 @@ NAME STR ThreePi DISTRIBUTION STR ThreePi - TESS STR RINGS.V0 + TESS STR RINGS.V3 OBSMODE STR 3PI STACKABLE BOOL FALSE DIFFABLE BOOL TRUE OFFNIGHT_DIFFS BOOL TRUE - CHIP S16 10 - DIFF S16 12 + CHIP S16 7 + DIFF S16 7 +# CHIP S16 10 +# DIFF S16 12 END TARGETS METADATA @@ -284,5 +286,5 @@ TARGETS METADATA NAME STR microtest - TESS STR RINGS.V0 + TESS STR RINGS.V3 COMMENT STR Microtest Obs% STACKABLE BOOL FALSE Index: /branches/eam_branches/ipp-20110710/ippconfig/recipes/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/recipes/ppStack.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/recipes/ppStack.config (revision 32345) @@ -139,4 +139,6 @@ END +QUICKSTACK_DEEP METADATA +END STACK_DEEP METADATA Index: /branches/eam_branches/ipp-20110710/ippconfig/recipes/psphot.config =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/recipes/psphot.config (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/recipes/psphot.config (revision 32345) @@ -482,4 +482,7 @@ END +CHIP_CONSTANT_WEIGHTPHOT METADATA +END + # Recipe overrides for PSPHOT in sdssmosaic PSPHOT_NOAP_PSF METADATA Index: /branches/eam_branches/ipp-20110710/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20110710/ippconfig/recipes/reductionClasses.mdc (revision 32344) +++ /branches/eam_branches/ipp-20110710/ippconfig/recipes/reductionClasses.mdc (revision 32345) @@ -216,4 +216,50 @@ END +CONSTANT_WEIGHTPHOT METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP_CONSTANT_WEIGHTPHOT + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND +END + + +DEFAULT_DARKTEST METADATA + CHIP_PPIMAGE STR CHIP_DARKTEST + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND +END + + DEFAULT_MASKTEST METADATA CHIP_PPIMAGE STR CHIP_MASKTEST @@ -310,4 +356,11 @@ STACK_PPSUB STR STACK STACK_PSPHOT STR STACK +END + +# quick deep stacks (for unconvolved refstacks and full,deep stacks) +DEEP_QUICKSTACK METADATA + STACK_PPSTACK STR QUICKSTACK_DEEP + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK END