Index: trunk/ippconfig/gpc1/psastro.config =================================================================== --- trunk/ippconfig/gpc1/psastro.config (revision 42813) +++ trunk/ippconfig/gpc1/psastro.config (revision 42844) @@ -636,5 +636,5 @@ # PSASTRO.CATDIR STR PS1.REF.20120524 # PSASTRO.CATDIR STR PS1.REF.20140605 -# PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 PSASTRO.CATDIR STR PS1.REF.20170919 ZERO.POINT.USE.MEAN BOOL TRUE Index: trunk/ippconfig/gpc2/psastro.config =================================================================== --- trunk/ippconfig/gpc2/psastro.config (revision 42813) +++ trunk/ippconfig/gpc2/psastro.config (revision 42844) @@ -459,5 +459,6 @@ DVO.GETSTAR.FIXED.ZEROPT F32 25.0 DVO.GETSTAR.MIN.MAG.INST F32 -15.0 - PSASTRO.CATDIR STR PS1.REF.20120524 +# PSASTRO.CATDIR STR PS1.REF.20120524 + PSASTRO.CATDIR STR PS1.REF.20170919 ZERO.POINT.USE.MEAN BOOL TRUE @@ -472,4 +473,5 @@ PSASTRO.MAX.ERROR F32 0.2 # in arcsec units, if larger than 0.2" on skycell then a problem.. + TRANSFORM.GALAXY.SHAPE.ERRORS BOOL T END Index: trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-mef.mdc (revision 42813) +++ trunk/ippconfig/recipes/filerules-mef.mdc (revision 42844) @@ -382,5 +382,6 @@ PPSTACK.OUTPUT.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE PPSTACK.OUTPUT.BKGMODEL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE NONE -PPSTACK.OUTPUT.BKGREST OUTPUT {OUTPUT}.bkgrest.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.BKGREST OUTPUT {OUTPUT}.bkgrest.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE Index: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 42813) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 42844) @@ -349,5 +349,4 @@ 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.COMP OUTPUT {OUTPUT}.unconv.fits IMAGE COMP_IMG FPA TRUE NONE PPSTACK.UNCONV.RAW OUTPUT {OUTPUT}.unconv.fits IMAGE NONE FPA TRUE NONE @@ -363,4 +362,5 @@ PPSTACK.OUTPUT.BKGMODEL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE NONE PPSTACK.OUTPUT.BKGREST OUTPUT {OUTPUT}.bkgrest.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 42813) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 42844) @@ -356,5 +356,4 @@ 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.EXP.NOCOMP OUTPUT {OUTPUT}.exp.fits IMAGE NONE FPA TRUE NONE @@ -379,4 +378,5 @@ PPSTACK.OUTPUT.BKGMODEL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE NONE PPSTACK.OUTPUT.BKGREST OUTPUT {OUTPUT}.bkgrest.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE Index: trunk/ippconfig/recipes/ppStack.config =================================================================== --- trunk/ippconfig/recipes/ppStack.config (revision 42813) +++ trunk/ippconfig/recipes/ppStack.config (revision 42844) @@ -239,4 +239,25 @@ END +XCSTACK_UNIONS_DR4 METADATA + CONVOLVE BOOL FALSE # Convolve images when stacking? + MATCH.ZERO.POINTS BOOL TRUE # Convolve images when stacking? + + COMBINE.ITER F32 0.0 # Number of rejection iterations per input + COMBINE.REJ F32 10.0 # Rejection threshold in combination (sigma) + COMBINE.SYS F32 0.1 # Relative systematic error in combination + COMBINE.DISCARD F32 0.0 # Discard fraction for Olympic weighted mean + + COMBINE.PERCENT BOOL TRUE # Use a single percentile clipping? + COMBINE.REJECT.FRACTION F32 0.0 # fraction of outliers to reject in percentile clipping + + SKIP.MISSING.INPUTS BOOL FALSE # If some input warp images are missing, make the stack anyway + + SKIP.BG.SUB BOOL TRUE # Bypass background subtraction? + + OUTPUT.NOCOMP BOOL FALSE # use filerules that make compressed outputs + OUTPUT.LOGFLUX BOOL TRUE # choose a log-scaling for output images + OUTPUT.DEEPEXP BOOL TRUE # allow exptime maps with dynamic range up to 2^16 (64k) seconds +END + TEST1 METADATA CONVOLVE BOOL FALSE # Convolve images when stacking? Index: trunk/ippconfig/recipes/ppStats.config =================================================================== --- trunk/ippconfig/recipes/ppStats.config (revision 42813) +++ trunk/ippconfig/recipes/ppStats.config (revision 42844) @@ -424,2 +424,55 @@ ANALYSIS STR MASKFRAC_MAX_NPIX END + +# basic stats for output images +XCSKYSTATS METADATA + HEADER MULTI + HEADER STR DT_DET # elapsed time in detrend processing + HEADER STR DT_PHOT # elapsed time in photometry processing + + HEADER STR NSTARS + HEADER STR NPSFSTAR + HEADER STR IQ_NSTAR + HEADER STR NDET_EXT + HEADER STR NDET_CR + + HEADER STR IQ_FW1 + HEADER STR IQ_FW1_E + HEADER STR IQ_FW2 + HEADER STR IQ_FW2_E + + HEADER STR IQ_M2 + HEADER STR IQ_M2_ER + HEADER STR IQ_M2_LQ + HEADER STR IQ_M2_UQ + + HEADER STR IQ_M2C + HEADER STR IQ_M2C_E + HEADER STR IQ_M2C_L + HEADER STR IQ_M2C_U + + HEADER STR IQ_M2S + HEADER STR IQ_M2S_E + HEADER STR IQ_M2S_L + HEADER STR IQ_M2S_U + + HEADER STR IQ_M3 + HEADER STR IQ_M3_ER + HEADER STR IQ_M3_LQ + HEADER STR IQ_M3_UQ + + HEADER STR IQ_M4 + HEADER STR IQ_M4_ER + HEADER STR IQ_M4_LQ + HEADER STR IQ_M4_UQ + HEADER STR DETEFF.MAGREF + + HEADER STR PSLIB_V + HEADER STR MODULE_V + HEADER STR PHOT_V + HEADER STR ASTRO_V + HEADER STR STATS_V + HEADER STR IMAGE_V + HEADER STR STREAK_V +END + Index: trunk/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 42813) +++ trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 42844) @@ -378,5 +378,4 @@ END - STACK_SKYCELL METADATA ENTRY MULTI @@ -470,4 +469,37 @@ END +XCSTACK_SKYCELL METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL ROBUST_MEDIAN F32 ROBUST_MEDIAN -bg + ENTRY VAL ROBUST_STDEV F32 RMS -bg_stdev + ENTRY VAL TIME_STACK F32 SUM -dtime_stack + ENTRY VAL GOOD_PIXEL_FRAC F32 MEAN -good_frac + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL STACK_V STR CONSTANT -ver_ppstack +END + +XCSKY_SKYCELL METADATA + ENTRY MULTI + TYPE VAL KEYWORD TYPE STATISTIC FLAG + ENTRY VAL DT_PHOT F32 SUM -dtime_photom + ENTRY VAL DT_TOTAL F32 SUM -dtime_total + ENTRY VAL NSTARS S32 SUM -n_stars + ENTRY VAL QUALITY S32 CONSTANT -quality # Bad quality flag + + # Revision values + ENTRY VAL PSLIB_V STR CONSTANT -ver_pslib + ENTRY VAL MODULE_V STR CONSTANT -ver_psmodules + ENTRY VAL PHOT_V STR CONSTANT -ver_psphot + ENTRY VAL STATS_V STR CONSTANT -ver_ppstats + ENTRY VAL STACK_V STR CONSTANT -ver_ppstack + ENTRY VAL STREAK_V STR CONSTANT -ver_streaks +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 42813) +++ trunk/ippconfig/recipes/psastro.config (revision 42844) @@ -256,4 +256,5 @@ DVO.GETSTAR.MIN.MAG F32 12.0 DVO.GETSTAR.MIN.MAG.INST F32 -15.0 +DVO.GETSTAR.PM.APPLY BOOL FALSE # if non-zero use as the zero point for computing magnitude limits for getstar Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 42813) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 42844) @@ -190,11 +190,13 @@ STACKPHOT_PPSUB STR STACKPHOT STACKPHOT_PPSTACK STR STACKPHOT - STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE - BACKGROUND_PPBACKGROUND STR BACKGROUND - BACKGROUND_PSWARP STR BACKGROUND - PSVIDEOPHOT STR PSVIDEOPHOT - STATICSKY_CALIBRATION STR STATICSKY_CAL - FULLFORCE_PSPHOT STR FULLFORCE_WARP - FPCAMERA STR DEFAULT_RECIPE + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL + FULLFORCE_PSPHOT STR FULLFORCE_WARP + FPCAMERA STR DEFAULT_RECIPE + XCSTACK_PPSTACK STR XCSTACK_UNIONS_DR4 + XCSTACK_PSPHOT STR STACKPHOT_SINGLE END @@ -2151,3 +2153,7 @@ BACKGROUND_PSWARP STR BACKGROUND PSVIDEOPHOT STR PSVIDEOPHOT -END + XCSTACK_PPSTACK STR XCSTACK_UNIONS_DR4 +# XCSTACK_PSPHOT STR STACKPHOT_SINGLE + XCSTACK_PSPHOT STR UNIONS_DR3 + FULLFORCE_PSPHOT STR FULLFORCE_EUCLID +END