Changeset 31674
- Timestamp:
- Jun 22, 2011, 12:57:22 AM (15 years ago)
- Location:
- trunk/ippconfig
- Files:
-
- 12 edited
-
. (modified) (1 prop)
-
gpc1/ppStack.config (modified) (1 diff)
-
isp/psastro.config (modified) (4 diffs)
-
megacam/format_mef.config (modified) (1 diff)
-
megacam/psastro.config (modified) (4 diffs)
-
megacam/psphot.config (modified) (1 diff)
-
recipes/filerules-mef.mdc (modified) (1 diff)
-
recipes/ppImage.config (modified) (2 diffs)
-
recipes/ppStack.config (modified) (4 diffs)
-
recipes/psastro.config (modified) (1 diff)
-
recipes/psphot.config (modified) (3 diffs)
-
recipes/reductionClasses.mdc (modified) (3 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippconfig
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20110505/ippconfig (added) merged: 31510,31523,31582,31585,31601,31616,31622,31624,31628,31657
- Property svn:mergeinfo changed
-
trunk/ippconfig/gpc1/ppStack.config
r31540 r31674 27 27 OUTPUT.NOCOMP BOOL TRUE 28 28 OUTPUT.LOGFLUX BOOL FALSE 29 30 PSF.INPUT.MAX F32 7.5 31 PSF.INPUT.CLIP.NSIGMA F32 5.0 29 32 END 30 33 -
trunk/ippconfig/isp/psastro.config
r31489 r31674 10 10 PSASTRO.GRID.DEL.ANGLE F32 0.5 11 11 PSASTRO.GRID.MIN.SIGMA F32 5.0 12 13 PSASTRO.PLOT.INST.MAG.MAX F32 -6.0 14 PSASTRO.PLOT.INST.MAG.MIN F32 -17.0 12 15 13 16 # pmAstromGridAngle … … 44 47 # these tweak are in FP units (pixels, currently) 45 48 PSASTRO.TWEAK.SCALE F32 1 46 PSASTRO.TWEAK.RANGE F32 7549 PSASTRO.TWEAK.RANGE F32 2 47 50 PSASTRO.TWEAK.SMOOTH F32 2 48 51 PSASTRO.TWEAK.NSIGMA F32 3 … … 50 53 # match radius in pixels for CHIP astrometry 51 54 PSASTRO.MATCH.RADIUS F32 5 55 56 # single-chip radius match in pixels 57 PSASTRO.MATCH.RADIUS F32 15 58 PSASTRO.MATCH.RADIUS.N0 F32 15 59 PSASTRO.MATCH.RADIUS.N1 F32 10 60 PSASTRO.MATCH.RADIUS.N2 F32 15 61 PSASTRO.MATCH.RADIUS.N3 F32 0 62 PSASTRO.MATCH.RADIUS.N4 F32 0 63 PSASTRO.MATCH.RADIUS.N5 F32 0 64 PSASTRO.MATCH.RADIUS.N6 F32 0 65 PSASTRO.MATCH.RADIUS.N7 F32 0 66 PSASTRO.MATCH.FIT.NITER S32 1 52 67 53 68 # pmAstromMatchFit … … 62 77 #MAG_MAX F32 10 63 78 PSASTRO.CATDIR STR SYNTH.BRIGHT 64 PSASTRO.MATCH.LUMFUNC BOOL TRUE79 PSASTRO.MATCH.LUMFUNC BOOL FALSE 65 80 PSASTRO.IGNORE STR SATURATED, DEFECT, SATSTAR, BLEND,FAIL 66 67 68 69 81 70 82 PHOTCODE.DATA MULTI #these are the zeropoints calculated by hand (10 stars) -
trunk/ippconfig/megacam/format_mef.config
r23986 r31674 107 107 FPA.TEMP STR DETTEM 108 108 FPA.EXPOSURE STR EXPTIME 109 FPA.ZP STR ZPT_OBS 109 110 CHIP.TEMP STR DETTEM 110 111 CELL.EXPOSURE STR EXPTIME -
trunk/ippconfig/megacam/psastro.config
r26902 r31674 23 23 24 24 PSASTRO.GRID.MIN.SCALE F32 0.96 25 PSASTRO.GRID.MAX.SCALE F32 1.0 025 PSASTRO.GRID.MAX.SCALE F32 1.04 26 26 PSASTRO.GRID.DEL.SCALE F32 0.02 27 27 28 28 # these tweak are in FP units (pixels, currently) 29 29 PSASTRO.TWEAK.SCALE F32 1 30 PSASTRO.TWEAK.RANGE F32 7530 PSASTRO.TWEAK.RANGE F32 2 31 31 PSASTRO.TWEAK.SMOOTH F32 2 32 32 PSASTRO.TWEAK.NSIGMA F32 3 … … 44 44 PSASTRO.MIN.INST.MAG.RAW F32 -17.0 # min instrumental magnitude for stars accepted for fitting 45 45 PSASTRO.MAX.INST.MAG.RAW F32 -11.0 # max instrumental magnitude for stars accepted for fitting 46 PSASTRO.GRID.MIN.INST.MAG.RAW F32 -17.0 # min instrumental magnitude for stars accepted for grid search 47 PSASTRO.GRID.MAX.INST.MAG.RAW F32 -10.0 # max instrumental magnitude for stars accepted for grid search 48 PSASTRO.GRID.MIN.SIGMA F32 4.0 46 49 47 50 PSASTRO.MAX.ERROR F32 10.0 # max error in pixels … … 94 97 END 95 98 99 # use this recipe to set a tight constraint 100 PSASTRO_COARSE METADATA 101 PSASTRO.GRID.SCALE F32 50.0 102 PSASTRO.TWEAK.RANGE F32 1.0 103 104 DVO.GETSTAR.MIN.MAG F32 10.0 105 DVO.GETSTAR.MAX.RHO F32 12000.0 106 107 PSASTRO.MAX.INST.MAG.RAW F32 -9.0 # max instrumental magnitude for stars accepted for fitting 108 PSASTRO.GRID.MAX.INST.MAG.RAW F32 -9.0 # max instrumental magnitude for stars accepted for grid search 109 110 PSASTRO.GRID.MIN.SIGMA F32 4.0 111 112 PSASTRO.MATCH.FIT.NITER S32 4 113 PSASTRO.MATCH.RADIUS.N0 F32 60.0 114 PSASTRO.MATCH.RADIUS.N1 F32 30.0 115 PSASTRO.MATCH.RADIUS.N2 F32 15.0 116 PSASTRO.MATCH.RADIUS.N3 F32 8.0 117 118 PSASTRO.MOSAIC.MAX.ERROR.N0 F32 0.0 # max allow error for valid solution (arcsec) 119 PSASTRO.MOSAIC.MAX.ERROR.N1 F32 0.0 # max allow error for valid solution (arcsec) 120 PSASTRO.MOSAIC.MAX.ERROR.N2 F32 0.0 # max allow error for valid solution (arcsec) 121 PSASTRO.MOSAIC.MAX.ERROR.N3 F32 0.0 # max allow error for valid solution (arcsec) 122 PSASTRO.MOSAIC.MAX.ERROR.N3 F32 2.0 # max allow error for valid solution (arcsec) 123 124 PSASTRO.MOSAIC.RADIUS.N0 F32 60.0 125 PSASTRO.MOSAIC.RADIUS.N1 F32 30.0 126 PSASTRO.MOSAIC.RADIUS.N2 F32 15.0 127 PSASTRO.MOSAIC.RADIUS.N3 F32 8.0 128 PSASTRO.MOSAIC.RADIUS.N4 F32 4.0 129 130 PSASTRO.MOSAIC.CHIP.ORDER.N0 S32 0 # fit order (-1 means use default) 131 PSASTRO.MOSAIC.CHIP.ORDER.N1 S32 1 # fit order (-1 means use default) 132 PSASTRO.MOSAIC.CHIP.ORDER.N2 S32 1 # fit order (-1 means use default) 133 PSASTRO.MOSAIC.CHIP.ORDER.N3 S32 1 # fit order (-1 means use default) 134 PSASTRO.MOSAIC.CHIP.ORDER.N4 S32 1 # fit order (-1 means use default) 135 END 136 96 137 PSASTRO.CATDIR STR SYNTH.GRIZY 97 138 DVO.GETSTAR.MAX.RHO F32 3000.0 … … 103 144 PHOTCODE.DATA METADATA 104 145 FILTER STR u 105 ZEROPT F32 2 5.28106 PHOTCODE STR g _SYNTH146 ZEROPT F32 23.6 147 PHOTCODE STR g 107 148 END 108 149 PHOTCODE.DATA METADATA 109 150 FILTER STR g 110 151 ZEROPT F32 26.46 111 PHOTCODE STR g _SYNTH152 PHOTCODE STR g 112 153 END 113 154 PHOTCODE.DATA METADATA 114 155 FILTER STR r 115 156 ZEROPT F32 25.98 116 PHOTCODE STR r _SYNTH157 PHOTCODE STR r 117 158 END 118 159 PHOTCODE.DATA METADATA 119 160 FILTER STR i 120 161 ZEROPT F32 25.74 121 PHOTCODE STR i _SYNTH162 PHOTCODE STR i 122 163 END 123 164 PHOTCODE.DATA METADATA 124 165 FILTER STR z 125 166 ZEROPT F32 24.80 126 PHOTCODE STR z _SYNTH167 PHOTCODE STR z 127 168 END 169 170 # plotting options 171 PSASTRO.PLOT.INST.MAG.MAX F32 -9.0 172 PSASTRO.PLOT.INST.MAG.MIN F32 -17.0 173 PSASTRO.PLOT.REF.MAG.MIN F32 +10.0 174 PSASTRO.PLOT.REF.MAG.MAX F32 +25.0 175 -
trunk/ippconfig/megacam/psphot.config
r25756 r31674 1 1 2 2 # turn these on to see specific outputs 3 SAVE.PLOTS BOOL TRUE3 SAVE.PLOTS BOOL FALSE 4 4 5 5 # PSF model parameters : choose the PSF model desired 6 PSF_MODEL STR PS_MODEL_QGAUSS 6 # PSF_MODEL STR PS_MODEL_QGAUSS 7 PSF_MODEL STR PS_MODEL_PS1_V1 8 # PSF_MODEL STR PS_MODEL_RGAUSS 7 9 8 10 PSF.TREND.MODE STR MAP 9 11 PSF.TREND.NX S32 1 10 12 PSF.TREND.NY S32 1 13 PSF_SN_LIM F32 5 # minimum S/N for stars used for PSF model 14 15 PEAKS_SMOOTH_SIGMA F32 2.5 # smoothing kernel sigma in pixels 16 PEAKS_NSIGMA_LIMIT F32 5.0 # peak significance threshold 17 MOMENTS_SCALE F32 0.1 # PSFs are generally small, avoid the CRs 18 19 PSF_FIT_RADIUS_SCALE F32 10.0 # fitting radius for test PSF model 20 21 PSPHOT.CRMASK.APPLY BOOL TRUE # TEST THIS before enabling. 22 23 MOMENTS_SX_MIN F32 1.0 24 MOMENTS_SY_MIN F32 1.0 25 26 BACKGROUND.XBIN S32 400 # size of background superpixels 27 BACKGROUND.YBIN S32 400 # size of background superpixels 28 BACKGROUND.XSAMPLE F32 2.0 # size of background superpixels 29 BACKGROUND.YSAMPLE F32 2.0 # size of background superpixels 30 IMSTATS_NPIX S32 40000 # number of pixels to use for sky estimate boxes: -
trunk/ippconfig/recipes/filerules-mef.mdc
r31270 r31674 192 192 PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE 193 193 PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE 194 194 PPIMAGE.PATTERN OUTPUT {OUTPUT}.ptn PATTERN NONE CHIP TRUE MEF 195 195 PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF 196 196 -
trunk/ippconfig/recipes/ppImage.config
r31079 r31674 540 540 BASE.FITS BOOL FALSE # Save base detrended image? 541 541 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 542 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image?542 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 543 543 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 544 544 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 545 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image?546 OVERSCAN BOOL FALSE # Overscan subtraction 547 NONLIN BOOL FALSE # Non-linearity correction; not implemented 548 BIAS BOOL FALSE # Bias subtraction 549 DARK BOOL FALSE # Dark subtraction 550 SHUTTER BOOL FALSE # Shutter correction 551 FLAT BOOL FALSE # Flat-field normalisation 552 MASK BOOL FALSE # Mask bad pixels 553 MASK.BUILD BOOL FALSE# Build internal mask?545 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 546 OVERSCAN BOOL FALSE # Overscan subtraction 547 NONLIN BOOL FALSE # Non-linearity correction; not implemented 548 BIAS BOOL FALSE # Bias subtraction 549 DARK BOOL FALSE # Dark subtraction 550 SHUTTER BOOL FALSE # Shutter correction 551 FLAT BOOL FALSE # Flat-field normalisation 552 MASK BOOL FALSE # Mask bad pixels 553 MASK.BUILD BOOL TRUE # Build internal mask? 554 554 FRINGE BOOL FALSE # Fringe subtraction 555 555 PHOTOM BOOL TRUE # Source identification and photometry … … 558 558 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 559 559 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 560 BACKGROUND BOOL TRUE # Subtract background? 561 # MASK.STATS BOOL TRUE # Calculate Mask statistics. 560 562 END 561 563 -
trunk/ippconfig/recipes/ppStack.config
r31633 r31674 59 59 ZP.MATCH F32 0.1 # Fraction of images to match for good star 60 60 ZP.AIRMASS METADATA # Airmass terms by filter 61 u.MP9301 F32 0.0 61 62 g F32 0.0 62 63 r F32 0.0 … … 67 68 END 68 69 ZP.TARGET METADATA # Target zero point by filter 70 u.MP9301 F32 25.0 69 71 g F32 25.0 70 72 r F32 25.0 … … 93 95 94 96 OUTPUT.NOCOMP BOOL FALSE # use filerules that make conconpressed outputs 95 OUTPUT.LOGFLUX BOOL FALSE 97 OUTPUT.LOGFLUX BOOL FALSE # choose a log-scaling for output images 96 98 97 99 OUTPUT.REPLICATE BOOL TRUE … … 147 149 STACK_THREEPI METADATA 148 150 END 151 152 TEST1 METADATA 153 PSF.AUTOSIZE BOOL FALSE # Determine output PSF size from input PSFs? 154 PSF.OUTPUT.FWHM F32 6.5 # Target size for output PSF (if not auto-sized) 155 PSF.MODEL STR PS_MODEL_PS1_V1 # Model for PSF generation 156 END 157 158 TEST2 METADATA 159 PSF.AUTOSIZE BOOL FALSE # Determine output PSF size from input PSFs? 160 PSF.OUTPUT.FWHM F32 7.0 # Target size for output PSF (if not auto-sized) 161 PSF.MODEL STR PS_MODEL_PS1_V1 # Model for PSF generation 162 END 163 164 TEST3 METADATA 165 PSF.AUTOSIZE BOOL FALSE # Determine output PSF size from input PSFs? 166 PSF.OUTPUT.FWHM F32 8.0 # Target size for output PSF (if not auto-sized) 167 PSF.MODEL STR PS_MODEL_PS1_V1 # Model for PSF generation 168 END -
trunk/ippconfig/recipes/psastro.config
r31456 r31674 226 226 END 227 227 228 PSASTRO_COARSE METADATA 229 END 230 228 231 PHOTCODE.DATA MULTI 229 232 PHOTCODE.DATA METADATA -
trunk/ippconfig/recipes/psphot.config
r31489 r31674 76 76 MOMENTS_SX_MAX F32 50.0 77 77 MOMENTS_SY_MAX F32 50.0 78 MOMENTS_SX_MIN F32 0.5 79 MOMENTS_SY_MIN F32 0.5 78 80 MOMENTS_AR_MAX F32 1.5 # maximum axial ratio: 1 / AR < (sx / sy) < AR 79 81 MOMENTS_GAUSS_SIGMA F32 4.0 # XXX this is now autoscaled … … 413 415 PSPHOT.STACK.USE.RAW BOOL F # perform photometry & morphology analysis on the raw image 414 416 @PSPHOT.STACK.TARGET.PSF.FWHM F32 8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels) 415 RADIAL_APERTURES BOOL T# calculate flux in circular radial apertures?417 RADIAL_APERTURES BOOL F # calculate flux in circular radial apertures? 416 418 RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation 417 OUTPUT.FORMAT STR PS1_SV1418 #OUTPUT.FORMAT STR PS1_V3419 # OUTPUT.FORMAT STR PS1_SV1 420 OUTPUT.FORMAT STR PS1_V3 419 421 420 422 # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE … … 429 431 PSF_MODEL STR PS_MODEL_PS1_V1 430 432 EXT_MODEL STR PS_MODEL_SERSIC 433 END 434 435 # Extended source fit parameters 436 APTEST_V1 METADATA 437 OUTPUT.FORMAT STR PS1_V3 438 439 # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE 440 # POISSON.ERRORS.PHOT.LMM BOOL FALSE 441 CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE 442 POISSON.ERRORS.PHOT.LMM BOOL TRUE 443 444 PSF_APERTURE_SCALE F32 4.5 445 PSF_REF_RADIUS F32 25 446 END 447 448 # Extended source fit parameters 449 APTEST_V2 METADATA 450 OUTPUT.FORMAT STR PS1_V3 451 452 # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE 453 # POISSON.ERRORS.PHOT.LMM BOOL FALSE 454 CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE 455 POISSON.ERRORS.PHOT.LMM BOOL TRUE 456 457 PSF_APERTURE_SCALE F32 4.5 458 PSF_REF_RADIUS F32 30 459 END 460 461 # Extended source fit parameters 462 APTEST_V3 METADATA 463 OUTPUT.FORMAT STR PS1_V3 464 465 # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE 466 # POISSON.ERRORS.PHOT.LMM BOOL FALSE 467 CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE 468 POISSON.ERRORS.PHOT.LMM BOOL TRUE 469 470 PSF_APERTURE_SCALE F32 4.5 471 PSF_REF_RADIUS F32 35 431 472 END 432 473 -
trunk/ippconfig/recipes/reductionClasses.mdc
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc (added) merged: 31510,31582,31622,31628,31657
r31633 r31674 163 163 BACKGROUND_PPBACKGROUND STR BACKGROUND 164 164 BACKGROUND_PSWARP STR BACKGROUND 165 END 166 167 # basic science analysis 168 APTEST_V1 METADATA 169 CHIP_PPIMAGE STR CHIP 170 CHIP_PSPHOT STR APTEST_V1 171 PSASTRO STR DEFAULT_RECIPE 172 JPEG_BIN1 STR PPIMAGE_J1 173 JPEG_BIN2 STR PPIMAGE_J2 174 END 175 176 # basic science analysis 177 APTEST_V2 METADATA 178 CHIP_PPIMAGE STR CHIP 179 CHIP_PSPHOT STR APTEST_V2 180 PSASTRO STR DEFAULT_RECIPE 181 JPEG_BIN1 STR PPIMAGE_J1 182 JPEG_BIN2 STR PPIMAGE_J2 183 END 184 185 # basic science analysis 186 APTEST_V3 METADATA 187 CHIP_PPIMAGE STR CHIP 188 CHIP_PSPHOT STR APTEST_V3 189 PSASTRO STR DEFAULT_RECIPE 190 JPEG_BIN1 STR PPIMAGE_J1 191 JPEG_BIN2 STR PPIMAGE_J2 165 192 END 166 193 … … 480 507 END 481 508 509 # photometry for pre-detrended images 510 MC_UBAND METADATA 511 CHIP_PPIMAGE STR PPIMAGE_P 512 CHIP_PSPHOT STR CHIP 513 WARP_PSWARP STR WARP 514 STACK_PPSTACK STR STACK 515 STACK_PPSUB STR STACK 516 STACK_PSPHOT STR STACK 517 DIFF_PPSUB STR DIFF 518 DIFF_PSPHOT STR DIFF 519 JPEG_BIN1 STR PPIMAGE_J1 520 JPEG_BIN2 STR PPIMAGE_J2 521 FAKEPHOT STR FAKEPHOT 522 ADDSTAR STR ADDSTAR 523 PSASTRO STR PSASTRO_COARSE 524 END 525 482 526 # photometry to make flat-field correction (apply flat_raw) 483 527 FLATCORR METADATA … … 701 745 END 702 746 747 # random user tests (may not be stable or consistent) 748 TEST1 METADATA 749 STACK_PPSTACK STR TEST1 750 STACK_PPSUB STR STACK 751 STACK_PSPHOT STR STACK 752 END 753 754 TEST2 METADATA 755 STACK_PPSTACK STR TEST2 756 STACK_PPSUB STR STACK 757 STACK_PSPHOT STR STACK 758 END 759 760 TEST3 METADATA 761 STACK_PPSTACK STR TEST3 762 STACK_PPSUB STR STACK 763 STACK_PSPHOT STR STACK 764 END 765 - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
