Index: trunk/ippconfig/hsc/psastro.config =================================================================== --- trunk/ippconfig/hsc/psastro.config (revision 41291) +++ trunk/ippconfig/hsc/psastro.config (revision 41292) @@ -4,28 +4,19 @@ # these values are in FP coordinates -# used for v1 - v9 -#PSASTRO.GRID.OFFSET F32 1000. -#PSASTRO.GRID.SCALE F32 50. - -# v10 -# use with FP scale = 1 chip pixel -# PSASTRO.GRID.OFFSET F32 150 -# PSASTRO.GRID.SCALE F32 10 - -# v11 -# use with FP scale = 1 chip pixel -PSASTRO.GRID.OFFSET F32 100 -PSASTRO.GRID.SCALE F32 5 - -# use with FP scale = 1 chip pixel +# these are appropriate for hsc.20200221.asm (1 FP pixel = 1 chip pixel) +PSASTRO.GRID.OFFSET F32 100. +PSASTRO.GRID.SCALE F32 5. +PSASTRO.TWEAK.RANGE F32 5. PSASTRO.REFSTAR.CLUMP.SCALE S32 10 -# PSASTRO.TWEAK.RANGE F32 10 - -# use with FP scale = 1 chip pixel -PSASTRO.TWEAK.RANGE F32 5 +# these are appropriate for hsc.20161020.asm (13.4 FP pixel = 1 chip pixels) +# PSASTRO.GRID.OFFSET F32 1000. +# PSASTRO.GRID.SCALE F32 50. +# PSASTRO.TWEAK.RANGE F32 10 +# PSASTRO.REFSTAR.CLUMP.SCALE S32 150 PSASTRO.SAVE.REFMATCH BOOL T # save refstars in a separate FITS table PSASTRO.SAVE.REFSTARS BOOL F # save refstars in a separate FITS file (broken!) + #PSASTRO.CATDIR STR PS1.REF.20140713 PSASTRO.CATDIR STR PS1.REF.20170919 @@ -39,58 +30,5 @@ DVO.GETSTAR.MIN.MAG.INST F32 -15.0 -# include FAIL or not? -# PSASTRO.IGNORE STR CRLIMIT,SATURATED,DEFECT,SATSTAR,BLEND,FAIL -PSASTRO.IGNORE STR CRLIMIT,SATURATED,DEFECT,SATSTAR,BLEND - -PHOTCODE.DATA MULTI -PHOTCODE.DATA METADATA - FILTER STR g -# ZEROPT F32 26.75 - ZEROPT F32 26.70 - PHOTCODE STR g - GHOST_MAX_MAG F32 -22.0 -END -PHOTCODE.DATA METADATA - FILTER STR r -# ZEROPT F32 27.1 - ZEROPT F32 27.05 - PHOTCODE STR r - GHOST_MAX_MAG F32 -22.5 -END -PHOTCODE.DATA METADATA - FILTER STR i -# ZEROPT F32 27.0 - ZEROPT F32 26.8 - PHOTCODE STR i - GHOST_MAX_MAG F32 -23.0 -END -PHOTCODE.DATA METADATA - FILTER STR z -# ZEROPT F32 26.2 - ZEROPT F32 26.0 - PHOTCODE STR z - GHOST_MAX_MAG F32 -23.0 -END -PHOTCODE.DATA METADATA - FILTER STR y -# ZEROPT F32 25.1 - ZEROPT F32 25.55 - PHOTCODE STR y - GHOST_MAX_MAG F32 -23.0 -END -PHOTCODE.DATA METADATA - FILTER STR NB816 -# ZEROPT F32 26.0 - ZEROPT F32 23.75 - PHOTCODE STR i - GHOST_MAX_MAG F32 -23.0 -END -PHOTCODE.DATA METADATA - FILTER STR NB921 -# ZEROPT F32 25.4 - ZEROPT F32 23.95 - PHOTCODE STR z - GHOST_MAX_MAG F32 -23.0 -END +PSASTRO.IGNORE STR CRLIMIT,SATURATED,DEFECT,SATSTAR,BLEND,FAIL PSASTRO.USE.MODEL BOOL TRUE @@ -118,17 +56,6 @@ PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas -# single-chip radius match in pixels -# PSASTRO.MATCH.RADIUS.N0 F32 30 -# PSASTRO.MATCH.RADIUS.N1 F32 20 -# PSASTRO.MATCH.RADIUS.N2 F32 20 -# PSASTRO.MATCH.RADIUS.N3 F32 10 -# PSASTRO.MATCH.RADIUS.N4 F32 10 -# PSASTRO.MATCH.RADIUS.N5 F32 8 # was 5 -# PSASTRO.MATCH.RADIUS.N6 F32 2 -# PSASTRO.MATCH.RADIUS.N7 F32 0 -# PSASTRO.MATCH.FIT.NITER S32 6 # was 7 - -# single-chip radius match in FP pixels (1 chip pixel = 13.3 FP pixels) -# used for v9 and some earlier +# single-chip radius match in FP pixels +# These are appropriate for hsc.20161020.asm (13.4 FP pixel = 1 chip pixels) # PSASTRO.MATCH.RADIUS.N0 F32 30 # PSASTRO.MATCH.RADIUS.N1 F32 30 @@ -141,18 +68,6 @@ # PSASTRO.MATCH.FIT.NITER S32 7 # was 7 -# v10.3 -# use with FP scale = 1 chip pixel -# PSASTRO.MATCH.RADIUS.N0 F32 10. -# PSASTRO.MATCH.RADIUS.N1 F32 10. -# PSASTRO.MATCH.RADIUS.N2 F32 8. -# PSASTRO.MATCH.RADIUS.N3 F32 8. -# PSASTRO.MATCH.RADIUS.N4 F32 6. -# PSASTRO.MATCH.RADIUS.N5 F32 6. -# PSASTRO.MATCH.RADIUS.N6 F32 4. -# PSASTRO.MATCH.RADIUS.N7 F32 4. -# PSASTRO.MATCH.FIT.NITER S32 7 # was 7 - -# v11 -# use with FP scale = 1 chip pixel +# these are appropriate for hsc.20200221.asm (1 FP pixel = 1 chip pixel) +# EAM NOTE: test this recipe for field images (non-M31) PSASTRO.MATCH.RADIUS.N0 F32 6.0 PSASTRO.MATCH.RADIUS.N1 F32 6.0 @@ -192,13 +107,5 @@ # mosaic radius match in Chip pixels (do these make sense?) # the smallest one-chip radius (8) should roughly match the -# largest mosaic radius x 13 -# this set was used by a test (t8.v0) -# PSASTRO.MOSAIC.RADIUS.N0 F32 1 -# PSASTRO.MOSAIC.RADIUS.N1 F32 1 -# PSASTRO.MOSAIC.RADIUS.N2 F32 0.8 -# PSASTRO.MOSAIC.RADIUS.N3 F32 0.8 -# PSASTRO.MOSAIC.RADIUS.N4 F32 0.5 -# PSASTRO.MOSAIC.RADIUS.N5 F32 0.5 - +# largest mosaic radius x plate scale PSASTRO.MOSAIC.RADIUS.N0 F32 3 PSASTRO.MOSAIC.RADIUS.N1 F32 3 @@ -226,12 +133,4 @@ # PSASTRO.MOSAIC.RADIUS.N5 F32 3 -# try a tighter range -# PSASTRO.MOSAIC.RADIUS.N0 F32 5 -# PSASTRO.MOSAIC.RADIUS.N1 F32 3 -# PSASTRO.MOSAIC.RADIUS.N2 F32 3 -# PSASTRO.MOSAIC.RADIUS.N3 F32 2 -# PSASTRO.MOSAIC.RADIUS.N4 F32 2 -# PSASTRO.MOSAIC.RADIUS.N5 F32 2 - # EAM : values pre 2020.02.09 # PSASTRO.MOSAIC.CHIP.ORDER S32 1 # limit chip-fit order to 1 @@ -279,5 +178,4 @@ GHOST_MODEL STR hsc/ghost.model.mdc - #REFSTAR_MASK_GLINTS BOOL TRUE REFSTAR_MASK_GLINTS BOOL FALSE @@ -287,7 +185,30 @@ GLINT_WIDTH F32 80.0 - +# HSC glint model terms: +# FILTER : allows model to have different terms for different filters +# FACTOR : scaling factor for glint model in mm for each filter +# LIMIT : instrumental magnitude limit (only brighter stars are used) +# example, for g-band 30 sec exposures, limit of -23 -> 7.5 mag +# +# to find the glint: +# R_FPA = hypot(TP_x, TP_y) --> note calculation is done in TPA units, not FPA units +# theta0 = datan2 (TP_y, TP_x) +# R (star_radius_deg) = GLINT.PIXEL.SCALE * R_FPA +# C_star = C_terms[0] + C_terms[1] * R + C_terms[2] * R^2 +# R_star = R_terms[0] + R_terms[1] * R + R_terms[2] * R^2 + +# C_star and R_star are in millimeter units; R is in degrees. # The slopes and radii and region below are all in FPA units, 1/13.5 of a regular pixel. +# these need to be adjusted to use 1 FPA pix = 1 CHIP pix (hsc.20200221.asm) + +# recipe values which need to be adjusted for 1 FPA pix = 1 CHIP pix: +# GLINT.PIXEL.SCALE (multiply by 13.4) +# REGION (divide by 13.4) +# GLINT.RADIUS.INNER (divide by 13.4) +# GLINT.RADIUS.OUTER (divide by 13.4) + +# NOTE: The code contains the 13.5 factor hard-wired in the HSC model + GLINT.REGION MULTI GLINT.REGION METADATA @@ -360,15 +281,8 @@ # GLINT.ANGLE.OUTER_ZERO F32 -41 -# GLINT.ANGLE.INNER_SLOPE F32 0.0 -# GLINT.ANGLE.INNER_ZERO F32 7.0 -# GLINT.ANGLE.INNER_ZERO F32 1.5 -# GLINT.ANGLE.OUTER_SLOPE F32 0.0 -# GLINT.ANGLE.OUTER_ZERO F32 22.0 -# GLINT.ANGLE.OUTER_ZERO F32 6.0 - - - - - +# GLINT.ANGLE.INNER_SLOPE F32 0.0 +# GLINT.ANGLE.INNER_ZERO F32 1.5 +# GLINT.ANGLE.OUTER_SLOPE F32 0.0 +# GLINT.ANGLE.OUTER_ZERO F32 22.0 # REFSTAR_MASK_GLINTS BOOL TRUE @@ -385,5 +299,4 @@ REFSTAR_MASK_GHOST BOOL TRUE END - STATICSKY_CAL METADATA @@ -414,44 +327,108 @@ M31_SHALLOW METADATA - PSASTRO.GRID.SCALE F32 100 - PSASTRO.PIXEL.SCALE F32 5.9 - - PSASTRO.GRID.MAX.INST.MAG.RAW F32 -8 + PSASTRO.MOSAIC.MODE BOOL FALSE + + PSASTRO.MAX.INST.MAG.RAW F32 -10 + PSASTRO.GRID.MAX.INST.MAG.RAW F32 -10 # single-chip radius match in pixels - PSASTRO.MATCH.RADIUS.N0 F32 10 - PSASTRO.MATCH.RADIUS.N1 F32 5 - PSASTRO.MATCH.RADIUS.N2 F32 5 - PSASTRO.MATCH.RADIUS.N3 F32 3 - PSASTRO.MATCH.RADIUS.N4 F32 3 - PSASTRO.MATCH.RADIUS.N5 F32 2 # was 5 - PSASTRO.MATCH.RADIUS.N6 F32 1 - PSASTRO.MATCH.RADIUS.N7 F32 0 - PSASTRO.MATCH.FIT.NITER S32 6 # was 7 + PSASTRO.MATCH.RADIUS.N0 F32 6.0 + PSASTRO.MATCH.RADIUS.N1 F32 6.0 + PSASTRO.MATCH.RADIUS.N2 F32 4.0 + PSASTRO.MATCH.RADIUS.N3 F32 4.0 + PSASTRO.MATCH.RADIUS.N4 F32 2.0 + PSASTRO.MATCH.RADIUS.N5 F32 2.0 + PSASTRO.MATCH.RADIUS.N6 F32 1.5 + PSASTRO.MATCH.RADIUS.N7 F32 1.5 + PSASTRO.MATCH.FIT.NITER S32 7 # was 7 + + # single-chip radius match in pixels + PSASTRO.ONE.CHIP.ORDER.N0 F32 1 + PSASTRO.ONE.CHIP.ORDER.N1 F32 1 + PSASTRO.ONE.CHIP.ORDER.N2 F32 2 + PSASTRO.ONE.CHIP.ORDER.N3 F32 2 + PSASTRO.ONE.CHIP.ORDER.N4 F32 3 + PSASTRO.ONE.CHIP.ORDER.N5 F32 3 + PSASTRO.ONE.CHIP.ORDER.N6 F32 3 + PSASTRO.ONE.CHIP.ORDER.N7 F32 3 END M31_DEEP METADATA - PSASTRO.GRID.SCALE F32 100 - PSASTRO.PIXEL.SCALE F32 5.9 - - PSASTRO.GRID.MAX.INST.MAG.RAW F32 -10.5 + PSASTRO.MOSAIC.MODE BOOL FALSE + + PSASTRO.MAX.INST.MAG.RAW F32 -10.5 + PSASTRO.GRID.MAX.INST.MAG.RAW F32 -10.5 # single-chip radius match in pixels - PSASTRO.MATCH.RADIUS.N0 F32 10 - PSASTRO.MATCH.RADIUS.N1 F32 5 - PSASTRO.MATCH.RADIUS.N2 F32 5 - PSASTRO.MATCH.RADIUS.N3 F32 3 - PSASTRO.MATCH.RADIUS.N4 F32 3 - PSASTRO.MATCH.RADIUS.N5 F32 2 # was 5 - PSASTRO.MATCH.RADIUS.N6 F32 1 - PSASTRO.MATCH.RADIUS.N7 F32 0 - PSASTRO.MATCH.FIT.NITER S32 6 # was 7 - - # XXX REMOVE later - PSASTRO.GRID.MIN.ANGLE F32 0.0 # start angle (degrees) - PSASTRO.GRID.MAX.ANGLE F32 0.1 - PSASTRO.GRID.MIN.SCALE F32 1.00 - PSASTRO.GRID.MAX.SCALE F32 1.01 - -END - + PSASTRO.MATCH.RADIUS.N0 F32 6.0 + PSASTRO.MATCH.RADIUS.N1 F32 6.0 + PSASTRO.MATCH.RADIUS.N2 F32 4.0 + PSASTRO.MATCH.RADIUS.N3 F32 4.0 + PSASTRO.MATCH.RADIUS.N4 F32 2.0 + PSASTRO.MATCH.RADIUS.N5 F32 2.0 + PSASTRO.MATCH.RADIUS.N6 F32 1.5 + PSASTRO.MATCH.RADIUS.N7 F32 1.5 + PSASTRO.MATCH.FIT.NITER S32 7 # was 7 + + # single-chip radius match in pixels + PSASTRO.ONE.CHIP.ORDER.N0 F32 1 + PSASTRO.ONE.CHIP.ORDER.N1 F32 1 + PSASTRO.ONE.CHIP.ORDER.N2 F32 2 + PSASTRO.ONE.CHIP.ORDER.N3 F32 2 + PSASTRO.ONE.CHIP.ORDER.N4 F32 3 + PSASTRO.ONE.CHIP.ORDER.N5 F32 3 + PSASTRO.ONE.CHIP.ORDER.N6 F32 3 + PSASTRO.ONE.CHIP.ORDER.N7 F32 3 +END + +PHOTCODE.DATA MULTI +PHOTCODE.DATA METADATA + FILTER STR g +# ZEROPT F32 26.75 + ZEROPT F32 26.70 + PHOTCODE STR g + GHOST_MAX_MAG F32 -22.0 +END +PHOTCODE.DATA METADATA + FILTER STR r +# ZEROPT F32 27.1 + ZEROPT F32 27.05 + PHOTCODE STR r + GHOST_MAX_MAG F32 -22.5 +END +PHOTCODE.DATA METADATA + FILTER STR i +# ZEROPT F32 27.0 + ZEROPT F32 26.8 + PHOTCODE STR i + GHOST_MAX_MAG F32 -23.0 +END +PHOTCODE.DATA METADATA + FILTER STR z +# ZEROPT F32 26.2 + ZEROPT F32 26.0 + PHOTCODE STR z + GHOST_MAX_MAG F32 -23.0 +END +PHOTCODE.DATA METADATA + FILTER STR y +# ZEROPT F32 25.1 + ZEROPT F32 25.55 + PHOTCODE STR y + GHOST_MAX_MAG F32 -23.0 +END +PHOTCODE.DATA METADATA + FILTER STR NB816 +# ZEROPT F32 26.0 + ZEROPT F32 23.75 + PHOTCODE STR i + GHOST_MAX_MAG F32 -23.0 +END +PHOTCODE.DATA METADATA + FILTER STR NB921 +# ZEROPT F32 25.4 + ZEROPT F32 23.95 + PHOTCODE STR z + GHOST_MAX_MAG F32 -23.0 +END + Index: trunk/ippconfig/hsc/psphot.config =================================================================== --- trunk/ippconfig/hsc/psphot.config (revision 41291) +++ trunk/ippconfig/hsc/psphot.config (revision 41292) @@ -85,2 +85,14 @@ END END + +M31_DEEP METADATA + BACKGROUND.XBIN S32 64 # size of background superpixels + BACKGROUND.YBIN S32 58 # size of background superpixels + BACKGROUND.XSAMPLE F32 2.0 # size of background superpixels + BACKGROUND.YSAMPLE F32 2.0 # size of background superpixels + + FOOTPRINT_GROW_RADIUS S32 0 + PSF_SN_LIM F32 250.0 + IMSTATS_NPIX S32 100000 + SKY_STAT STR ROBUST_MEDIAN +END