Index: /trunk/ippconfig/gpc2/ppImage.config =================================================================== --- /trunk/ippconfig/gpc2/ppImage.config (revision 42389) +++ /trunk/ippconfig/gpc2/ppImage.config (revision 42390) @@ -15,4 +15,6 @@ NONLIN BOOL FALSE # apply non-linearity correction OLDDARK BOOL FALSE + +PATTERN.DEAD.CELLS BOOL FALSE # mask dead cells based on background patterns GAIN.OVERRIDE BOOL TRUE # Override a non-finite gain? @@ -1880,108 +1882,108 @@ # test recipes # currently : default CHIP recipe -APTEST_V1 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 FALSE # 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 FALSE # Mask potential burntool trails - PATTERN.ROW BOOL FALSE # Row pattern correction - PATTERN.CELL BOOL FALSE # Cell pattern correction - 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 FALSE # Subtract model background? - - DETREND.CONSTRAINTS METADATA - DARK METADATA - DETTYPE STR DARK - EXPTIME STR FPA.EXPOSURE - END - FLAT METADATA - DETTYPE STR FLAT_PREMASK - FILTER STR FPA.FILTERID - END - MASK METADATA - DETTYPE STR MASK - END - END -END +# APTEST_V1 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 FALSE # 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 FALSE # Mask potential burntool trails +# PATTERN.ROW BOOL FALSE # Row pattern correction +# PATTERN.CELL BOOL FALSE # Cell pattern correction +# 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 FALSE # Subtract model background? +# +# DETREND.CONSTRAINTS METADATA +# DARK METADATA +# DETTYPE STR DARK +# EXPTIME STR FPA.EXPOSURE +# END +# FLAT METADATA +# DETTYPE STR FLAT_PREMASK +# FILTER STR FPA.FILTERID +# END +# MASK METADATA +# DETTYPE STR MASK +# END +# END +# END # test recipes # currently : default CHIP recipe as normal -APTEST_V2 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 FALSE # 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 FALSE # Subtract model background? -END - -# test recipes -# currently : default CHIP recipe -APTEST_V3 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 FALSE # 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 FALSE # Subtract model background? -END +# APTEST_V2 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 FALSE # 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 FALSE # Subtract model background? +# END +# +# # test recipes +# # currently : default CHIP recipe +# APTEST_V3 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 FALSE # 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 FALSE # Subtract model background? +# END PPIMAGE_BKGCONT METADATA Index: /trunk/ippconfig/recipes/Makefile.am =================================================================== --- /trunk/ippconfig/recipes/Makefile.am (revision 42389) +++ /trunk/ippconfig/recipes/Makefile.am (revision 42390) @@ -34,4 +34,5 @@ ppBackground.mdc \ pstamp.config \ + fpcamera.config \ remote_hosts.config Index: /trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-mef.mdc (revision 42389) +++ /trunk/ippconfig/recipes/filerules-mef.mdc (revision 42390) @@ -19,4 +19,6 @@ PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF PSPHOT.PSF.SAVE STR PSPHOT.PSF.RAW.SAVE + +FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF.MEF ### Redirections (SPL) @@ -67,6 +69,7 @@ PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE PPIMAGE.LINEARITY INPUT @DETDB CHIP LINEARITY +PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP +PPIMAGE.PATTERN.DEAD.CELLS INPUT @DETDB FPA PATTERN.DEAD.CELLS PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN -PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP ## Files used by ppMerge @@ -200,4 +203,10 @@ PPBACKGROUND.BACKGROUND INPUT @FILES CHIP IMAGE PPBACKGROUND.STACK INPUT @FILES FPA IMAGE + +## files used by fpcamera +FPCAMERA.INPUT INPUT @FILES CHIP IMAGE +FPCAMERA.INPUT.MASK INPUT @FILES CHIP MASK +FPCAMERA.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE +FPCAMERA.INPUT.ASTROM INPUT @FILES CHIP WCS ### output file definitions @@ -313,4 +322,9 @@ PSASTRO.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE +FPCAMERA.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF +FPCAMERA.RESID OUTPUT {OUTPUT}.res.fits IMAGE COMP_SUB CHIP TRUE MEF +FPCAMERA.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +FPCAMERA.CONFIG OUTPUT {OUTPUT}.mdc TEXT NONE FPA TRUE NONE + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE Index: /trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-simple.mdc (revision 42389) +++ /trunk/ippconfig/recipes/filerules-simple.mdc (revision 42390) @@ -33,4 +33,6 @@ PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN +FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF + ## Files used by psvideophot PSVIDEOPHOT.INPUT INPUT @FILES CHIP IMAGE @@ -170,4 +172,10 @@ PPBACKGROUND.STACK INPUT @FILES FPA IMAGE +## files used by fpcamera +FPCAMERA.INPUT INPUT @FILES CHIP IMAGE +FPCAMERA.INPUT.MASK INPUT @FILES CHIP MASK +FPCAMERA.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE +FPCAMERA.INPUT.ASTROM INPUT @FILES CHIP WCS + ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT @@ -265,4 +273,9 @@ PSASTRO.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK CHIP TRUE NONE +FPCAMERA.OUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE +FPCAMERA.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE COMP_SUB CHIP TRUE NONE +FPCAMERA.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +FPCAMERA.CONFIG OUTPUT {OUTPUT}.mdc TEXT NONE FPA TRUE NONE + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE Index: /trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-split.mdc (revision 42389) +++ /trunk/ippconfig/recipes/filerules-split.mdc (revision 42390) @@ -27,4 +27,6 @@ PPSTACK.UNCONV.VARIANCE STR PPSTACK.UNCONV.VARIANCE.COMP PPSTACK.UNCONV.EXPWT STR PPSTACK.UNCONV.EXPWT.COMP + +FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF.MEF ### input file definitions @@ -53,4 +55,5 @@ PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP +PPIMAGE.PATTERN.DEAD.CELLS INPUT @DETDB FPA PATTERN.DEAD.CELLS ## Files used by psvideophot @@ -183,4 +186,10 @@ PPBACKGROUND.STACK INPUT @FILES FPA IMAGE +## files used by fpcamera +FPCAMERA.INPUT INPUT @FILES CHIP IMAGE +FPCAMERA.INPUT.MASK INPUT @FILES CHIP MASK +FPCAMERA.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE +FPCAMERA.INPUT.ASTROM INPUT @FILES CHIP WCS + ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT @@ -293,4 +302,9 @@ PSASTRO.OUT.ORIGINAL.CMF.MEF OUTPUT {OUTPUT}.smf.original CMF NONE FPA TRUE MEF +FPCAMERA.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF +FPCAMERA.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE COMP_SUB CHIP TRUE NONE +FPCAMERA.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE +FPCAMERA.CONFIG OUTPUT {OUTPUT}.mdc TEXT NONE FPA TRUE NONE + # XXX need to use CHIP for tc3 tests, but why? #PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE Index: /trunk/ippconfig/recipes/fpcamera.config =================================================================== --- /trunk/ippconfig/recipes/fpcamera.config (revision 42390) +++ /trunk/ippconfig/recipes/fpcamera.config (revision 42390) @@ -0,0 +1,19 @@ + +FPCAMERA.TEST F32 1.0 + +# nominal plate scale (units / pixel) +# NOTE: we are using pixels here because of the limited dynamic range for +# NAXIS1,2 when loaded by addstar. +FPCAMERA.PIXEL.SCALE F32 1.0 + +# extra field for ref stars: +FPCAMERA.FIELD.PADDING F32 0.25 # pad by this fraction of the full mosaic (may need to be larger for single chips) + +# path or name (in site:FPCAMERA.CATDIRS) to catdir +FPCAMERA.CATDIR STR PS1.REF.20170919 + +DVO.GETSTAR STR getstar +DVO.GETSTAR.OUTFORMAT STR PS1_DEV_0 + +DEFAULT_RECIPE METADATA +END Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 42389) +++ /trunk/ippconfig/recipes/ppImage.config (revision 42390) @@ -28,4 +28,5 @@ PATTERN.CELL BOOL FALSE # Cell pattern correction (see options below) PATTERN.CONTINUITY BOOL FALSE # continuity corrections (see options below) +PATTERN.DEAD.CELLS BOOL FALSE # continuity corrections (see options below) FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry @@ -103,4 +104,6 @@ OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? OVERSCAN.VALUE F32 0.0 # value to apply, if requested +OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value +OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value # Pattern Row subtraction options @@ -2617,17 +2620,27 @@ OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented - BIAS BOOL TRUE # Bias subtraction + 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 - 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? + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + 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 FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + MASK.STATS BOOL FALSE # Calculate Mask statistics. + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + BACKGROUND BOOL TRUE # Subtract background? - MASK.STATS BOOL TRUE # Calculate Mask statistics. + PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) + OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction + OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction END @@ -2643,17 +2656,27 @@ OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented - BIAS BOOL TRUE # Bias subtraction + 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 - 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? + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + 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 FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + MASK.STATS BOOL FALSE # Calculate Mask statistics. + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + BACKGROUND BOOL TRUE # Subtract background? - MASK.STATS BOOL TRUE # Calculate Mask statistics. + PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) + OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction + OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction END Index: /trunk/ippconfig/recipes/ppSim.config =================================================================== --- /trunk/ippconfig/recipes/ppSim.config (revision 42389) +++ /trunk/ippconfig/recipes/ppSim.config (revision 42390) @@ -8,5 +8,5 @@ OBS_MODE STR NONE -BIAS BOOL TRUE +BIAS BOOL FALSE BIAS.LEVEL F32 1000.0 # Bias level (e) BIAS.RANGE F32 20.0 # Range of bias values (e) Index: /trunk/ippconfig/recipes/ppStats.config =================================================================== --- /trunk/ippconfig/recipes/ppStats.config (revision 42389) +++ /trunk/ippconfig/recipes/ppStats.config (revision 42390) @@ -35,4 +35,6 @@ HEADER MULTI HEADER STR OVER_VAL + HEADER STR BACK_VAL + HEADER STR BACK_ERR HEADER STR APMIFIT HEADER STR DAPMIFIT @@ -148,4 +150,26 @@ ANALYSIS STR MASKFRAC_MAX_DYNAMIC ANALYSIS STR MASKFRAC_MAX_NPIX +END + +# stats for camera-level analysis (astrometry, summary stats) +FPCAMERA METADATA + HEADER MULTI + HEADER STR ZPT_OBS + HEADER STR ZPT_ERR + + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR FPCAM_V + HEADER STR STATS_V + HEADER STR IMAGE_V + HEADER STR STREAK_V + + HEADER STR NDET # sources->n + HEADER STR NDET_EXT + HEADER STR NDET_FRC + + ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis + ANALYSIS STR PSPHOT.HEADER END Index: /trunk/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- /trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 42389) +++ /trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 42390) @@ -455,4 +455,19 @@ END +FPCAMERA_EXP METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL ZPT_OBS F32 SAMPLE_MEAN -zpt_obs + ENTRY VAL ZPT_ERR F32 RMS -zpt_err + ENTRY VAL ZPT_UQ F32 UQ -zpt_uq + ENTRY VAL ZPT_LQ F32 LQ -zpt_lq + ENTRY VAL NDET S32 SUM -n_stars + + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL FPCAM_V STR CONSTANT -ver_fpcamera +END + # values to extract from output metadata and the stats to calculate # XXX -bg_mean_stdev should take rms of bg_mean_stdev if bg_mean_stdev != 0 (A) Index: /trunk/ippconfig/recipes/psastro.config =================================================================== --- /trunk/ippconfig/recipes/psastro.config (revision 42389) +++ /trunk/ippconfig/recipes/psastro.config (revision 42390) @@ -4,4 +4,6 @@ PSASTRO.SAVE.REFMATCH BOOL FALSE # save refstar matches as table in output smf file PSASTRO.SAVE.CFF BOOL FALSE # save a cff file (input for psphotFullForce) + +PSASTRO.SKIP.ASTROMETRY BOOL FALSE # select which WCS style to use on output images. @@ -406,2 +408,6 @@ END +APTEST_V1 METADATA + PSASTRO.SKIP.ASTROMETRY BOOL TRUE +END + Index: /trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /trunk/ippconfig/recipes/reductionClasses.mdc (revision 42389) +++ /trunk/ippconfig/recipes/reductionClasses.mdc (revision 42390) @@ -185,4 +185,5 @@ STATICSKY_CALIBRATION STR STATICSKY_CAL FULLFORCE_PSPHOT STR FULLFORCE_WARP + FPCAMERA STR DEFAULT_RECIPE END @@ -385,5 +386,5 @@ CHIP_PPIMAGE STR APTEST_V1 CHIP_PSPHOT STR APTEST_V1 - PSASTRO STR DEFAULT_RECIPE + PSASTRO STR APTEST_V1 JPEG_BIN1 STR PPIMAGE_J1 JPEG_BIN2 STR PPIMAGE_J2 @@ -1464,4 +1465,5 @@ ADDSTAR STR ADDSTAR PSASTRO STR DEFAULT_RECIPE + FPCAMERA STR DEFAULT_RECIPE END Index: /trunk/ippconfig/system.config =================================================================== --- /trunk/ippconfig/system.config (revision 42389) +++ /trunk/ippconfig/system.config (revision 42390) @@ -68,4 +68,5 @@ PSVIDEOPHOT STR recipes/psvideophot.config # video cell photometry PSTAMP STR recipes/pstamp.config # postage stamp server + FPCAMERA STR recipes/fpcamera.config # forced photometry on chip # REMOTE STR recipes/remote_hosts.config # Remote supercomputer processing END