Index: /trunk/ippconfig/cfh12k/psastro.config =================================================================== --- /trunk/ippconfig/cfh12k/psastro.config (revision 21068) +++ /trunk/ippconfig/cfh12k/psastro.config (revision 21069) @@ -8,38 +8,50 @@ # max grid offset in FP units (microns) # use plate-scale to make this in pixels? -PSASTRO.GRID.OFFSET F32 2500.0 +PSASTRO.GRID.OFFSET F32 1500.0 +# PSASTRO.GRID.OFFSET F32 12500.0 PSASTRO.GRID.SCALE F32 50.0 +PSASTRO.GRID.NSTAR.MAX S32 800 # max stars accepted for fitting + +PSASTRO.GRID.MIN.ANGLE F32 -1.0 # start angle (degrees) +PSASTRO.GRID.MAX.ANGLE F32 +1.0 +PSASTRO.GRID.DEL.ANGLE F32 0.5 + +PSASTRO.GRID.MIN.SCALE F32 0.98 +PSASTRO.GRID.MAX.SCALE F32 1.021 +PSASTRO.GRID.DEL.SCALE F32 0.02 + +PSASTRO.GRID.MIN.SIGMA F32 5.0 + # extra field for ref stars: -PSASTRO.FIELD.PADDING F32 1.0 +# PSASTRO.FIELD.PADDING F32 6.0 +PSASTRO.FIELD.PADDING F32 0.25 -# these tweak are in FP units (pixels, currently) -PSASTRO.TWEAK.SCALE F32 1 -PSASTRO.TWEAK.RANGE F32 75 -PSASTRO.TWEAK.SMOOTH F32 2 -PSASTRO.TWEAK.NSIGMA F32 3 +# allow saturated stars if needed +PSASTRO.MIN.INST.MAG.RAW F32 -17.0 # min instrumental magnitude for stars accepted for fitting +PSASTRO.MAX.INST.MAG.RAW F32 -10.0 # max instrumental magnitude for stars accepted for fitting +PSASTRO.IGNORE STR CRLIMIT,SATURATED,DEFECT,BLEND,FAIL # single-chip radius match in pixels -PSASTRO.MATCH.FIT.NITER S32 3 -PSASTRO.MATCH.RADIUS F32 12.0 -PSASTRO.MATCH.RADIUS.N0 F32 15.0 -PSASTRO.MATCH.RADIUS.N1 F32 10.0 -PSASTRO.MATCH.RADIUS.N2 F32 5.0 +PSASTRO.MATCH.RADIUS.N0 F32 20.0 +PSASTRO.MATCH.RADIUS.N1 F32 15.0 +PSASTRO.MATCH.RADIUS.N2 F32 10.0 +PSASTRO.MATCH.RADIUS.N3 F32 10.0 +PSASTRO.MATCH.RADIUS.N4 F32 10.0 +PSASTRO.MATCH.FIT.NITER S32 5 PSASTRO.MAX.NRAW S32 1500 # max stars accepted for fitting (0 for all) PSASTRO.MAX.NREF S32 1500 # max stars accepted for fitting (0 for all) -PSASTRO.MIN.INST.MAG.RAW F32 -17.0 # min instrumental magnitude for stars accepted for fitting -PSASTRO.MAX.INST.MAG.RAW F32 -8.0 # max instrumental magnitude for stars accepted for fitting - PSASTRO.MAX.ERROR F32 10.0 # max error in pixels PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution -PSASTRO.MOSAIC.MODE BOOL FALSE +PSASTRO.MOSAIC.MODE BOOL TRUE -PSASTRO.MOSAIC.MAX.ERROR.N0 F32 1.50 # max allow error for valid solution (arcsec) -PSASTRO.MOSAIC.MAX.ERROR.N1 F32 1.50 # max allow error for valid solution (arcsec) -PSASTRO.MOSAIC.MAX.ERROR.N2 F32 0.90 # max allow error for valid solution (arcsec) -PSASTRO.MOSAIC.MAX.ERROR.N3 F32 0.90 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N0 F32 0.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N1 F32 0.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N2 F32 0.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N3 F32 0.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N4 F32 1.00 # max allow error for valid solution (arcsec) PSASTRO.MOSAIC.RADIUS.N0 F32 10.0 # initial match (after chip astrom) @@ -47,9 +59,11 @@ PSASTRO.MOSAIC.RADIUS.N2 F32 8.0 # do not refine the match PSASTRO.MOSAIC.RADIUS.N3 F32 4.0 # +PSASTRO.MOSAIC.RADIUS.N4 F32 4.0 # PSASTRO.MOSAIC.CHIP.ORDER.N0 S32 0 # fit order (-1 means use default) -PSASTRO.MOSAIC.CHIP.ORDER.N1 S32 1 # 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 3 # 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 0 # 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.GRADIENT.NX S32 2 # number of x-dir cells per chip @@ -74,6 +88,33 @@ END -PSASTRO.GRID.MIN.SCALE F32 0.98 -PSASTRO.GRID.MAX.SCALE F32 1.04 -PSASTRO.GRID.DEL.SCALE F32 0.02 -PSASTRO.GRID.MIN.SIGMA F32 5.0 +PSASTRO.CATDIR STR SYNTH.GRIZY +DVO.GETSTAR.MAX.RHO F32 3000.0 +DVO.GETSTAR.MIN.MAG F32 12.0 +DVO.GETSTAR.MIN.MAG.INST F32 -15.0 + +PHOTCODE.DATA MULTI +PHOTCODE.DATA METADATA + FILTER STR B + ZEROPT F32 26.00 + PHOTCODE STR g +END +PHOTCODE.DATA METADATA + FILTER STR V + ZEROPT F32 26.15 + PHOTCODE STR g +END +PHOTCODE.DATA METADATA + FILTER STR R + ZEROPT F32 26.19 + PHOTCODE STR r +END +PHOTCODE.DATA METADATA + FILTER STR I + ZEROPT F32 26.14 + PHOTCODE STR i +END +PHOTCODE.DATA METADATA + FILTER STR Z + ZEROPT F32 25.83 + PHOTCODE STR z +END