Index: /branches/czw_branch/20130702/ippconfig/suprime/format_mef.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/suprime/format_mef.config (revision 36054) +++ /branches/czw_branch/20130702/ippconfig/suprime/format_mef.config (revision 36055) @@ -8,4 +8,5 @@ # NAXIS S32 2 EXTEND BOOL T + PSMOSIAC STR CHIP # HISTORY STR imsplice: Splicing results in all detectors as if read from A amplifier END @@ -13,10 +14,10 @@ FILE METADATA # How to read this data - PHU STR CHIP # The FITS file represents an entire FPA - EXTENSIONS STR NONE # The extensions represent chips + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # The extensions represent chips FPA.OBS STR EXP-ID # A PHU keyword for unique identifier - CONTENT STR DETECTOR # Key to the CONTENTS menu - CHIP.NAME STR DETECTOR - CONTENT.RULE STR {CHIP.NAME} # How to derive the CONTENT when writing +# CONTENT STR DETECTOR # Key to the CONTENTS menu +# CHIP.NAME STR DETECTOR +# CONTENT.RULE STR {CHIP.NAME} # How to derive the CONTENT when writing END @@ -35,5 +36,5 @@ san STR XY30:spcam20080721 - XY01 STR XY01:spcam20080721 + XY01 STR XY01:spcam20080721 XY11 STR XY11:spcam20080721 XY21 STR XY21:spcam20080721 Index: /branches/czw_branch/20130702/ippconfig/suprime/format_split.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/suprime/format_split.config (revision 36054) +++ /branches/czw_branch/20130702/ippconfig/suprime/format_split.config (revision 36055) @@ -5,4 +5,5 @@ TELESCOP STR Subaru INSTRUME STR SuprimeCam + OBSERVAT STR NAOJ # NAXIS S32 2 END @@ -31,5 +32,5 @@ san STR XY30:spcam20080721 - XY01 STR XY01:spcam20080721 + XY01 STR XY01:spcam20080721 XY11 STR XY11:spcam20080721 XY21 STR XY21:spcam20080721 @@ -57,5 +58,6 @@ CELL.TRIMSEC.SOURCE STR VALUE CELL.BIASSEC STR [0:0,0:0] - CELL.TRIMSEC STR [1:2048,1:4225] +# CELL.TRIMSEC STR [1:2048,1:4225] + CELL.TRIMSEC STR [1:2048,1:4177] CELL.X0 S32 0 CELL.GAIN.SOURCE STR HEADER Index: /branches/czw_branch/20130702/ippconfig/suprime/psastro.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/suprime/psastro.config (revision 36054) +++ /branches/czw_branch/20130702/ippconfig/suprime/psastro.config (revision 36055) @@ -11,5 +11,5 @@ # max grid offset in FP units (microns) # use plate-scale to make this in pixels? -PSASTRO.GRID.OFFSET F32 2500. +PSASTRO.GRID.OFFSET F32 750. PSASTRO.GRID.SCALE F32 50. @@ -18,7 +18,7 @@ # pmAstromGridMatch parameters -PSASTRO.GRID.MIN.ANGLE F32 -1.0 # start angle (degrees) -PSASTRO.GRID.MAX.ANGLE F32 +1.0 -PSASTRO.GRID.DEL.ANGLE F32 1.0 +PSASTRO.GRID.MIN.ANGLE F32 -0.5 # start angle (degrees) +PSASTRO.GRID.MAX.ANGLE F32 +0.5 +PSASTRO.GRID.DEL.ANGLE F32 0.25 PSASTRO.GRID.MIN.SCALE F32 0.96 @@ -28,26 +28,30 @@ # these tweak are in FP units (pixels, currently) PSASTRO.TWEAK.SCALE F32 1 -PSASTRO.TWEAK.RANGE F32 2 +PSASTRO.TWEAK.RANGE F32 150 PSASTRO.TWEAK.SMOOTH F32 2 PSASTRO.TWEAK.NSIGMA F32 3 # 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.FIT.NITER S32 5 +PSASTRO.MATCH.RADIUS F32 100.0 +PSASTRO.MATCH.RADIUS.N0 F32 100.0 +PSASTRO.MATCH.RADIUS.N1 F32 60.0 +PSASTRO.MATCH.RADIUS.N2 F32 40.0 +PSASTRO.MATCH.RADIUS.N3 F32 30.0 +PSASTRO.MATCH.RADIUS.N4 F32 20.0 +PSASTRO.MATCH.UNIQ.ITER S32 4 +PSASTRO.CHIP.ORDER S32 1 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 -11.0 # max instrumental magnitude for stars accepted for fitting -PSASTRO.GRID.MIN.INST.MAG.RAW F32 -17.0 # min instrumental magnitude for stars accepted for grid search -PSASTRO.GRID.MAX.INST.MAG.RAW F32 -10.0 # max instrumental magnitude for stars accepted for grid search -PSASTRO.GRID.MIN.SIGMA F32 4.0 +PSASTRO.MIN.INST.MAG.RAW F32 -20.0 # min instrumental magnitude for stars accepted for fitting +PSASTRO.MAX.INST.MAG.RAW F32 -11.5 # max instrumental magnitude for stars accepted for fitting +PSASTRO.GRID.MIN.INST.MAG.RAW F32 -20.0 # min instrumental magnitude for stars accepted for grid search +PSASTRO.GRID.MAX.INST.MAG.RAW F32 -11.5 # max instrumental magnitude for stars accepted for grid search +PSASTRO.GRID.MIN.SIGMA F32 1.0 PSASTRO.MAX.ERROR F32 10.0 # max error in pixels -PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution +PSASTRO.MIN.NSTAR S32 5 # min fitted stars in solution PSASTRO.MAX.ALLOWED.FWHM F32 25 @@ -56,27 +60,31 @@ # for iterations >= N, require a single match per reference -PSASTRO.MOSAIC.CHIP.NITER S32 4 # fit clipping iterations +PSASTRO.MOSAIC.CHIP.NITER S32 5 # fit clipping iterations PSASTRO.MOSAIC.CHIP.NSIGMA F32 3 # fit clipping sigmas -PSASTRO.MOSAIC.UNIQ.ITER S32 2 +PSASTRO.MOSAIC.UNIQ.ITER S32 3 -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.N0 F32 1.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N1 F32 1.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N2 F32 1.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N3 F32 1.00 # max allow error for valid solution (arcsec) PSASTRO.MOSAIC.MAX.ERROR.N4 F32 2.00 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N5 F32 5.00 # max allow error for valid solution (arcsec) -PSASTRO.MOSAIC.RADIUS.N0 F32 15.0 -PSASTRO.MOSAIC.RADIUS.N1 F32 8.0 # do not refine the match -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.RADIUS.N0 F32 40.0 +PSASTRO.MOSAIC.RADIUS.N1 F32 35.0 # do not refine the match +PSASTRO.MOSAIC.RADIUS.N2 F32 30.0 # do not refine the match +PSASTRO.MOSAIC.RADIUS.N3 F32 25.0 +PSASTRO.MOSAIC.RADIUS.N4 F32 20.0 +PSASTRO.MOSAIC.RADIUS.N5 F32 10.0 -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 S32 1 +PSASTRO.MOSAIC.CHIP.ORDER.N0 S32 1 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N1 S32 2 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N2 S32 2 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N3 S32 2 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N4 S32 2 # fit order (-1 means use default) +PSASTRO.MOSAIC.CHIP.ORDER.N5 S32 2 # fit order (-1 means use default) -PSASTRO.MOSAIC.GRADIENT.NX S32 2 # number of x-dir cells per chip +PSASTRO.MOSAIC.GRADIENT.NX S32 5 # number of x-dir cells per chip PSASTRO.MOSAIC.GRADIENT.NY S32 5 # number of y-dir cells per chip @@ -137,8 +145,8 @@ END -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 +PSASTRO.CATDIR STR PS1.REF.20120524 +DVO.GETSTAR.MAX.RHO F32 30000.0 +DVO.GETSTAR.MIN.MAG F32 -10.0 +DVO.GETSTAR.MIN.MAG.INST F32 -40.0 # we match the FILTER.ID (corresponding to the FILTER, see camera.config) to the dvo db PHOTCODE @@ -169,4 +177,14 @@ PHOTCODE STR z END +PHOTCODE.DATA METADATA + FILTER STR Vr + ZEROPT F32 25.0 + PHOTCODE STR g +END +PHOTCODE.DATA METADATA + FILTER STR Rc + ZEROPT F32 25.0 + PHOTCODE STR r +END # plotting options