Index: /trunk/ippconfig/recipes/ppSim.config =================================================================== --- /trunk/ippconfig/recipes/ppSim.config (revision 13053) +++ /trunk/ippconfig/recipes/ppSim.config (revision 13054) @@ -10,6 +10,6 @@ SKY.RATE F32 10.0 # Sky illumination rate (e/s) STARS.LUM F32 -1.5 # Stellar luminosity function slope -STARS.MAG F32 15.0 # Brightest magnitude for fake stars -STARS.DENSITY F32 2.0 # Stellar density (per square degree) at the brightest magnitude +STARS.MAG F32 13.0 # Brightest magnitude for fake stars +STARS.DENSITY F32 1.0 # Stellar density (per square degree) at the brightest magnitude ### The following options are used if not defined by the concepts (e.g., usually read from headers) Index: /trunk/ippconfig/simmosaic/Makefile.am =================================================================== --- /trunk/ippconfig/simmosaic/Makefile.am (revision 13053) +++ /trunk/ippconfig/simmosaic/Makefile.am (revision 13054) @@ -4,6 +4,5 @@ install_files = \ camera.config \ - format_chip_cell.config \ - format_chip_none.config \ + format_split.config \ ppImage.config \ psastro.config \ Index: /trunk/ippconfig/simtest/camera.config =================================================================== --- /trunk/ippconfig/simtest/camera.config (revision 13053) +++ /trunk/ippconfig/simtest/camera.config (revision 13054) @@ -43,4 +43,5 @@ PPIMAGE STR simtest/ppImage.config # Default: all (normal) options on PSPHOT STR simtest/psphot.config # psphot details + PSASTRO STR simmosaic/psastro.config # psastro details END @@ -52,5 +53,5 @@ BIAS LIMITS * 0 1 20 0.5 20 0 3 20 0 0 0 0.5 DARK LIMITS * 0 1 0 0.5 0 0 3 20 0 0 0 0.5 - SHUTTER LIMITS * 0 0 0 0 0 0 0 0 0 0 0 20.0 + SHUTTER LIMITS * 0 0 0 0 0 0 0 0 0 0 0 0 FLAT LIMITS * 0 0 0 0 0 0 0 0 3 0 0 0 # FLAT LIMITS u 0 0 0 0 0 0 0 0 3 0 0 0 @@ -151,2 +152,8 @@ # user can set the colormap, scaling method, scaling range (JPEG only) # user can set the extension name for the data and header segments (CMF only) + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? +END + Index: /trunk/ippconfig/simtest/format.config =================================================================== --- /trunk/ippconfig/simtest/format.config (revision 13053) +++ /trunk/ippconfig/simtest/format.config (revision 13054) @@ -44,4 +44,6 @@ CELL.DARKTIME STR DARKTIME CELL.TIME STR DATE-OBS UTC-OBS # Date and time + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN END @@ -62,6 +64,4 @@ CELL.XSIZE S32 2048 CELL.YSIZE S32 2048 - CELL.XBIN S32 1 - CELL.YBIN S32 1 CELL.GAIN F32 1.0 CELL.READNOISE F32 10.0 Index: /trunk/ippconfig/simtest/ppImage.config =================================================================== --- /trunk/ippconfig/simtest/ppImage.config (revision 13053) +++ /trunk/ippconfig/simtest/ppImage.config (revision 13054) @@ -16,5 +16,5 @@ OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE -OVERSCAN.ORDER S32 3 # Order of polynomial fit +OVERSCAN.ORDER S32 7 # Order of polynomial fit OVERSCAN.STAT STR MEAN # MEAN | MEDIAN @@ -43,5 +43,5 @@ # Overscan subtraction only PPIMAGE_O METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction @@ -85,5 +85,5 @@ # Overscan, bias, dark PPIMAGE_OBD METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -99,5 +99,5 @@ # Overscan, bias, dark, shutter PPIMAGE_OBDS METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -113,5 +113,5 @@ # Overscan, bias, dark, shutter, flat-field PPIMAGE_OBDSF METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -127,5 +127,5 @@ # Overscan, bias, dark, shutter, flat-field, fringe PPIMAGE_OBDSFR METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -141,5 +141,5 @@ # Overscan, bias, dark, shutter, flat-field, fringe, photom PPIMAGE_OBDSFRP METADATA - OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction DARK BOOL TRUE # Dark subtraction @@ -148,6 +148,6 @@ MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction - PHOTOM BOOL FALSE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? END @@ -162,6 +162,6 @@ MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction - PHOTOM BOOL FALSE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? END Index: /trunk/ippconfig/simtest/psastro.config =================================================================== --- /trunk/ippconfig/simtest/psastro.config (revision 13053) +++ /trunk/ippconfig/simtest/psastro.config (revision 13054) @@ -1,36 +1,1 @@ - -# astrometry matching parameters - -# nominal plate scale (microns / pixel) -# PSASTRO.PLATE.SCALE F32 13.5 -PSASTRO.PLATE.SCALE F32 1.0 - -# pmAstromGridMatch: -PSASTRO.GRID.MIN.ANGLE F32 -0.0851 -PSASTRO.GRID.MAX.ANGLE F32 +0.0851 -PSASTRO.GRID.DEL.ANGLE F32 0.0170 - -# pmAstromGridAngle -# max grid offset in FP units (microns) -# use plate-scale to make this in pixels? -# PSASTRO.GRID.OFFSET F32 10000. -# PSASTRO.GRID.SCALE F32 500. -PSASTRO.GRID.OFFSET F32 1000. -PSASTRO.GRID.SCALE F32 50 - -# 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 - -# pmAstromRadiusMatch -# use plate-scale to make this in pixels? -PSASTRO.MATCH.RADIUS F32 8 - -# pmAstromMatchFit -PSASTRO.CHIP.NX S32 1 # fit order -PSASTRO.CHIP.NY S32 1 # fit order -PSASTRO.CHIP.NITER S32 3 # fit clipping iterations -PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas - +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass/