Index: trunk/ippconfig/hsc/psastro.config =================================================================== --- trunk/ippconfig/hsc/psastro.config (revision 41287) +++ trunk/ippconfig/hsc/psastro.config (revision 41288) @@ -1,2 +1,28 @@ + +# with the external model, this has no effect (it is ignored) +PSASTRO.PIXEL.SCALE F32 1.0 + +# 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 +PSASTRO.REFSTAR.CLUMP.SCALE S32 10 + +# PSASTRO.TWEAK.RANGE F32 10 + +# use with FP scale = 1 chip pixel +PSASTRO.TWEAK.RANGE F32 5 PSASTRO.SAVE.REFMATCH BOOL T # save refstars in a separate FITS table @@ -7,7 +33,13 @@ DVO.GETSTAR.OUTFORMAT STR PS1_DEV_0 DVO.GETSTAR.PHOTCODE STR i -DVO.GETSTAR.MAX.RHO F32 90000.0 -DVO.GETSTAR.MIN.MAG F32 -3.0 -DVO.GETSTAR.MIN.MAG.INST F32 -27.0 + +## these were allowing much too dense of a reference catalog +DVO.GETSTAR.MAX.RHO F32 30000.0 +DVO.GETSTAR.MIN.MAG F32 15.0 +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 @@ -62,5 +94,4 @@ END - PSASTRO.USE.MODEL BOOL TRUE @@ -75,6 +106,10 @@ PSASTRO.GRID.NRAW.MAX S32 5000 # max stars accepted for fitting -PSASTRO.GRID.MIN.INST.MAG.RAW F32 -14 -PSASTRO.GRID.MAX.INST.MAG.RAW F32 -9 +PSASTRO.MIN.INST.MAG.RAW F32 -15 # min instrumental magnitude for stars accepted for fitting +PSASTRO.MAX.INST.MAG.RAW F32 -11 # max instrumental magnitude for stars accepted for fitting +PSASTRO.GRID.MIN.INST.MAG.RAW F32 -15 +PSASTRO.GRID.MAX.INST.MAG.RAW F32 -11 + +## PSASTRO.GRID.MAX.INST.MAG.RAW -11 is OK for the 30 sec exp but may be too many for 300 sec. # pmAstromMatchFit @@ -84,13 +119,59 @@ # 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 +# 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 +# PSASTRO.MATCH.RADIUS.N0 F32 30 +# PSASTRO.MATCH.RADIUS.N1 F32 30 +# PSASTRO.MATCH.RADIUS.N2 F32 20 +# PSASTRO.MATCH.RADIUS.N3 F32 20 +# PSASTRO.MATCH.RADIUS.N4 F32 10 +# PSASTRO.MATCH.RADIUS.N5 F32 10 # was 5 +# PSASTRO.MATCH.RADIUS.N6 F32 8 +# PSASTRO.MATCH.RADIUS.N7 F32 8 +# 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 +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 # Mosaic Astrometry options @@ -109,19 +190,56 @@ PSASTRO.MOSAIC.MAX.ERROR.N5 F32 0.30 # max allow error for valid solution (arcsec) -# mosaic radius match in pixels (do these make sense?) -PSASTRO.MOSAIC.RADIUS.N0 F32 15 -PSASTRO.MOSAIC.RADIUS.N1 F32 10 -PSASTRO.MOSAIC.RADIUS.N2 F32 10 -PSASTRO.MOSAIC.RADIUS.N3 F32 5 -PSASTRO.MOSAIC.RADIUS.N4 F32 5 -PSASTRO.MOSAIC.RADIUS.N5 F32 3 - -PSASTRO.MOSAIC.CHIP.ORDER S32 1 # limit chip-fit order to 1 -PSASTRO.MOSAIC.CHIP.ORDER.N0 S32 0 # fit order (-1 means use default) -PSASTRO.MOSAIC.CHIP.ORDER.N1 S32 0 # fit order (-1 means use default) -PSASTRO.MOSAIC.CHIP.ORDER.N2 S32 1 # fit order (-1 means use default) -PSASTRO.MOSAIC.CHIP.ORDER.N3 S32 1 # fit order (-1 means use default) +# 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 + +PSASTRO.MOSAIC.RADIUS.N0 F32 3 +PSASTRO.MOSAIC.RADIUS.N1 F32 3 +PSASTRO.MOSAIC.RADIUS.N2 F32 2 +PSASTRO.MOSAIC.RADIUS.N3 F32 2 +PSASTRO.MOSAIC.RADIUS.N4 F32 2 +PSASTRO.MOSAIC.RADIUS.N5 F32 2 + +# use 3rd order all the way. +PSASTRO.MOSAIC.CHIP.ORDER S32 3 # limit chip-fit order to 1 +PSASTRO.MOSAIC.CHIP.ORDER.N0 S32 3 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N1 S32 3 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N2 S32 3 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N3 S32 3 # fit order (-1 means use default) PSASTRO.MOSAIC.CHIP.ORDER.N4 S32 3 # fit order (-1 means use default) PSASTRO.MOSAIC.CHIP.ORDER.N5 S32 3 # fit order (-1 means use default) + +# mosaic radius match in Chip pixels (do these make sense?) +# EAM : values pre 2020.02.09 +# PSASTRO.MOSAIC.RADIUS.N0 F32 15 +# PSASTRO.MOSAIC.RADIUS.N1 F32 10 +# PSASTRO.MOSAIC.RADIUS.N2 F32 10 +# PSASTRO.MOSAIC.RADIUS.N3 F32 5 +# PSASTRO.MOSAIC.RADIUS.N4 F32 5 +# 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 +# PSASTRO.MOSAIC.CHIP.ORDER.N0 S32 0 # fit order (-1 means use default) +# PSASTRO.MOSAIC.CHIP.ORDER.N1 S32 0 # fit order (-1 means use default) +# PSASTRO.MOSAIC.CHIP.ORDER.N2 S32 1 # fit order (-1 means use default) +# PSASTRO.MOSAIC.CHIP.ORDER.N3 S32 1 # fit order (-1 means use default) +# PSASTRO.MOSAIC.CHIP.ORDER.N4 S32 3 # fit order (-1 means use default) +# PSASTRO.MOSAIC.CHIP.ORDER.N5 S32 3 # fit order (-1 means use default) PSASTRO.MODEL.REF.CHIP STR x050