Index: branches/eam_branches/ipp-20150419/ippconfig/gpc1/ppStack.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/gpc1/ppStack.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/gpc1/ppStack.config (revision 38449) @@ -357,5 +357,5 @@ -STACK_MD_PV3_NIGHT_1DG METADATA ## Revised MD 8 input NIGHT stacks for PV3 -- not complete +STACK_MD_PV3_NIGHT_1DG METADATA ## Revised MD 8 input NIGHT stacks for PV3 -- no time to test, so similar to original but 1DG OUTPUT.NOCOMP BOOL FALSE OUTPUT.LOGFLUX BOOL FALSE @@ -365,17 +365,18 @@ PSF.INPUT.THRESH F32 NAN PSF.INPUT.ASYMMETRY F32 NAN - MATCH.REJ F32 4.0 # need ot tune? - SAFE BOOL FALSE - ## + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL TRUE # Play safe when combining small number of values? PSF.TARGET.AS.MAX BOOL TRUE # Set the target PSF FWHM as the maximum of accepted input FWHM values. PSF.TARGET.AS.MAX.EPSILON F32 0.1 # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input) - THRESHOLD.MASK F32 0.1 # Threshold for mask deconvolution (0..1) - COMBINE.ITER F32 0.5 # Number of rejection iterations per input - COMBINE.REJ F32 3.0 # Rejection threshold in combination (sigma) - COMBINE.SYS F32 0.1 # Relative systematic error in combination - COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean - IMAGE.REJ F32 0.1 # Rejected pixel fraction threshold for rejecting entire image - NMINPIX S32 4 # Minimum input per pixel - MASK.VAL STR SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels + ## -- extra masking not tested and likely not want for small Nin stack + #THRESHOLD.MASK F32 0.1 # Threshold for mask deconvolution (0..1) + #COMBINE.ITER F32 0.5 # Number of rejection iterations per input + #COMBINE.REJ F32 3.0 # Rejection threshold in combination (sigma) + #COMBINE.SYS F32 0.1 # Relative systematic error in combination + #COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean + #IMAGE.REJ F32 0.1 # Rejected pixel fraction threshold for rejecting entire image + #MASK.VAL STR SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels + ## -- + NMINPIX S32 1 # Minimum input per pixel MASK.BLANKBORDER S32 20 # Mask blank border in final stack output BSCALEOFFSET BOOL FALSE # MUST be FALSE for PV3 Index: branches/eam_branches/ipp-20150419/ippconfig/gpc1/psastro.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/gpc1/psastro.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/gpc1/psastro.config (revision 38449) @@ -398,4 +398,10 @@ END +SNIA_ASTRO METADATA + ZERO.POINT.USE.MEAN BOOL TRUE + PSASTRO.MAX.ALLOWED.FWHM F32 16 + PSASTRO.CATDIR STR PS1.REF.20140713 +END + MD_ASTRO METADATA ZERO.POINT.BY.EXPOSURE BOOL TRUE Index: branches/eam_branches/ipp-20150419/ippconfig/gpc2/Makefile.am =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/gpc2/Makefile.am (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/gpc2/Makefile.am (revision 38449) @@ -11,5 +11,6 @@ ppMerge.config \ psphot.config \ - psastro.config + psastro.config \ + nightly_science.config install_DATA = $(install_files) Index: branches/eam_branches/ipp-20150419/ippconfig/gpc2/camera.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/gpc2/camera.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/gpc2/camera.config (revision 38449) @@ -112,4 +112,5 @@ PSASTRO STR gpc2/psastro.config PSPHOT STR gpc2/psphot.config + NIGHTLY_SCIENCE STR gpc2/nightly_science.config # PSWARP STR gpc2/pswarp.config # PSVIDEOPHOT STR gpc2/psvideophot.config Index: branches/eam_branches/ipp-20150419/ippconfig/gpc2/nightly_science.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/gpc2/nightly_science.config (revision 38449) +++ branches/eam_branches/ipp-20150419/ippconfig/gpc2/nightly_science.config (revision 38449) @@ -0,0 +1,8 @@ +FILTERS MULTI +FILTERS STR g.00002 +FILTERS STR r.00002 +FILTERS STR i.00002 +FILTERS STR z.00002 +FILTERS STR y.00002 +FILTERS STR w.00002 + Index: branches/eam_branches/ipp-20150419/ippconfig/gpc2/ppImage.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/gpc2/ppImage.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/gpc2/ppImage.config (revision 38449) @@ -708,10 +708,10 @@ # Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom PPIMAGE_DET_ONLY METADATA - BASE.FITS BOOL FALSE # Save base detrended image? + BASE.FITS BOOL TRUE # 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? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # apply non-linearity correction @@ -719,10 +719,10 @@ DARK BOOL TRUE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL TRUE # Flat-field normalisation + FLAT BOOL FALSE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels MASK.BUILD BOOL TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? FPA1.FITS BOOL FALSE # Save 1st binned fpa image? FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/Makefile.am =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/Makefile.am (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/Makefile.am (revision 38449) @@ -33,5 +33,6 @@ nightly_science.config \ ppBackground.mdc \ - pstamp.config + pstamp.config \ + remote_hosts.config install_DATA = $(install_files) Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-mef.mdc =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-mef.mdc (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-mef.mdc (revision 38449) @@ -96,4 +96,5 @@ PSPHOT.STACK.EXPNUM.RAW INPUT @FILES CHIP EXPNUM PSPHOT.STACK.PSF.RAW INPUT @FILES CHIP PSF +PSPHOT.STACK.BACKMDL.RAW INPUT @FILES CHIP IMAGE PSPHOT.STACK.INPUT.CNV INPUT @FILES CHIP IMAGE PSPHOT.STACK.MASK.CNV INPUT @FILES CHIP MASK Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-simple.mdc =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-simple.mdc (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-simple.mdc (revision 38449) @@ -67,4 +67,5 @@ PSPHOT.STACK.EXPNUM.RAW INPUT @FILES CHIP MASK PSPHOT.STACK.PSF.RAW INPUT @FILES CHIP PSF +PSPHOT.STACK.BACKMDL.RAW INPUT @FILES CHIP IMAGE PSPHOT.STACK.INPUT.CNV INPUT @FILES CHIP IMAGE PSPHOT.STACK.MASK.CNV INPUT @FILES CHIP MASK Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-split.mdc (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/filerules-split.mdc (revision 38449) @@ -87,4 +87,5 @@ PSPHOT.STACK.EXPNUM.RAW INPUT @FILES CHIP EXPNUM PSPHOT.STACK.PSF.RAW INPUT @FILES CHIP PSF +PSPHOT.STACK.BACKMDL.RAW INPUT @FILES CHIP IMAGE PSPHOT.STACK.INPUT.CNV INPUT @FILES CHIP IMAGE PSPHOT.STACK.MASK.CNV INPUT @FILES CHIP MASK @@ -190,4 +191,7 @@ PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE +PPIMAGE.OUTPUT.NOCOMP OUTPUT {OUTPUT}.{CHIP.NAME}.raw.fits IMAGE RAW_IMG CHIP TRUE NONE +# PPIMAGE.OUTPUT.NOCOMP OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE RAW_IMG CHIP TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE COMP_IMG CHIP TRUE NONE PPIMAGE.CHIP.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/fitstypes.mdc =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/fitstypes.mdc (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/fitstypes.mdc (revision 38449) @@ -51,4 +51,20 @@ SKY_WEIGHT METADATA BITPIX S32 -32 +END + +# Uncompressed positive image +RAW_IMG METADATA +# BITPIX S32 -32 + BITPIX S32 16 + SCALING STR MANUAL + BSCALE F32 1.0 + BZERO F32 32768.0 + STDEV.BITS S32 4 + STDEV.NUM F32 10 + COMPRESSION STR NONE + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 END Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/nightly_science.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/nightly_science.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/nightly_science.config (revision 38449) @@ -94,4 +94,5 @@ DIFFABLE BOOL FALSE OFFNIGHT_DIFFS BOOL FALSE + REDUCTION STR SNIA_DEFAULT ## change days till cleanup DIST S16 300 Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/ppImage.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/ppImage.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/ppImage.config (revision 38449) @@ -40,4 +40,5 @@ CHECK.CTE BOOL FALSE # measure CTE errors? CHECK.NOISE BOOL FALSE +SQUASH.NANS BOOL FALSE USE.DEBURNED.IMAGE BOOL FALSE # use burntool-repaired image? USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data @@ -584,4 +585,5 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BACKGROUND BOOL TRUE # Subtract background? END Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/psastro.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/psastro.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/psastro.config (revision 38449) @@ -205,4 +205,6 @@ DVO.GETSTAR.FIXED.ZEROPT F32 0.0 +TRANSFORM.GALAXY.SHAPE.ERRORS BOOL FALSE + ZERO.POINT.BY.EXPOSURE BOOL TRUE ZERO.POINT.USE.MEAN BOOL TRUE @@ -286,4 +288,7 @@ END +SNIA_ASTRO METADATA +END + CNP_ASTRO_PV3 METADATA END Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/reductionClasses.mdc =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/reductionClasses.mdc (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/reductionClasses.mdc (revision 38449) @@ -226,4 +226,31 @@ FULLFORCE_PSPHOT STR FULLFORCE_WARP END + +# SNIa basic/nightly science analysis +SNIA_DEFAULT METADATA + CHIP_PPIMAGE STR CHIP + 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 SNIA_ASTRO + 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 + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL + FULLFORCE_PSPHOT STR FULLFORCE_WARP +END + # basic science analysis @@ -756,4 +783,7 @@ STACK_PSPHOT STR STACK STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE STATICSKY_CALIBRATION STR STATICSKY_NIGHTCAL END Index: branches/eam_branches/ipp-20150419/ippconfig/recipes/remote_hosts.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/recipes/remote_hosts.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/recipes/remote_hosts.config (revision 38449) @@ -5,13 +5,25 @@ SEC_HOST MULTI - SEC_HOST STR mu-fe1 - SEC_HOST STR mu-fe2 - SEC_HOST STR mu-fe3 - SEC_HOST STR mu-fe4 + SEC_HOST METADATA + SEC_HOST1 STR mu-fe1 + SEC_HOST2 STR mu-fe2 + SEC_HOST3 STR mu-fe3 + SEC_HOST4 STR mu-fe4 END IPP_PATH STR /turquoise/usr/projects/cosmo/mswarren/ipp/ REMOTE_ROOT STR /scratch3/watersc1/ - REMOTE_HOSTNAME STR LANL/Mustang + REMOTE_HOSTNAME STR LANL/Mustang + +# This is used to decide if we bring back warp images, and if stack should ask for local copies. + TRANSFER_WARP_IMAGES BOOL FALSE + + SCHEDULER STR MOAB + + PROC_PER_NODE S32 24 + MIN_NODES S32 1 + MAX_NODES S32 1000 + MIN_TIME S32 1 + MAX_TIME S32 8 END @@ -20,4 +32,5 @@ SEC_HOST MULTI + SEC_HOST METADATA END @@ -25,3 +38,13 @@ REMOTE_ROOT STR /lus/scratch/watersc/ REMOTE_HOSTNAME STR UH/Cray + + TRANSFER_WARP_IMAGES BOOL FALSE + + SCHEDULER STR SLURM + + PROC_PER_NODE S32 20 + MIN_NODES S32 1 + MAX_NODES S32 10 + MIN_TIME S32 1 + MAX_TIME S32 8 END Index: branches/eam_branches/ipp-20150419/ippconfig/system.config =================================================================== --- branches/eam_branches/ipp-20150419/ippconfig/system.config (revision 38448) +++ branches/eam_branches/ipp-20150419/ippconfig/system.config (revision 38449) @@ -66,3 +66,4 @@ PSVIDEOPHOT STR recipes/psvideophot.config # video cell photometry PSTAMP STR recipes/pstamp.config # postage stamp server + REMOTE STR recipes/remote_hosts.config # Remote supercomputer processing END