Index: /branches/eam_branch_20070817/ppSim/notes.txt =================================================================== --- /branches/eam_branch_20070817/ppSim/notes.txt (revision 14620) +++ /branches/eam_branch_20070817/ppSim/notes.txt (revision 14620) @@ -0,0 +1,30 @@ + +* should not have to supply ZP, Seeing, PA, Scale on command line for all ppSim runs +* DVO.CATDIR path://SIMTEST is not being interpolated? +* -D PSASTRO:DVO.CATDIR is not being interpretted? + +* fake stars do not have random magnitudes? +* add generated stars to an output file (pmSource list?) +* make star source an option (random / dvo database) +* generate PSF from PSF model + +ppSimLoop: + + * load catalogs stars (ra, dec, mag, x, y) + * generate random stars (ra, dec, mag, x, y) + * loop over chip,cell,readout + ** generate output images (signal, variance) + ** add the bias + ** add the dark + ** add the sky signal + ** add the stars (modified by the flat, shutter) + ** add the galaxies (modified by the flat, shutter) + ** add the poisson noise + ** add the overscan + readnoise + ** save the stars + ** save the galaxies + + ** update the concept info + ** update the header wcs info + ** write out the image data + Index: /branches/eam_branch_20070817/ppSim/psf.txt =================================================================== --- /branches/eam_branch_20070817/ppSim/psf.txt (revision 14620) +++ /branches/eam_branch_20070817/ppSim/psf.txt (revision 14620) @@ -0,0 +1,59 @@ + +Code to load a psf model and construct psf images. This assumes there +is an analysis loop which is performing pmFPAfileIOChecks at the +appropriate levels. + +** to supply a psf model from the command, define the command-line arguments (ppSimArguments.c) + + pmConfigFileSetsMD (config->arguments, &argc, argv, "PSPHOT.PSF", "-psf", "-psflist"); + +** if a psf model is supplied, generate a pmFPAfile to carry it. bind + it to the pmFPAfile in your main loop (ppSimCreate.c): + + // have we supplied a psf model? + if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) { + bool status = false; + + // tie the psf file to the chipMosaic + // file is the pmFPAfile used for the analysis loop + pmFPAfileBindFromArgs(&status, file, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "Failed to find/build PSPHOT.PSF.LOAD"); + // XXX free things to be freed... + return NULL; + } + } + +** generate source models from the psf and insert into a readout: + + // load the psf model from the corresponding chip. note: you may + // need to select the chip from the current readout, eg: (ppSimInsertSources.c) + // pmCell *cell = readout->parent; + // pmChip *chip = cell->parent; + pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF"); + + + // instantiate a model for the PSF at this location, set desired flux + + // note that pmModelFromPSFforXY takes the chip coordinate. you many + // need to convert the x,y coordinate in the readout to/from the x,y + // coordinate. (ppSimInsertSources.c) + pmModel *model = pmModelFromPSFforXY (psf, xChip, yChip, 1.0); + pmModelSetFlux (model, flux); + + // define the radius of valid pixels + float radius = model->modelRadius (model->params, noise); + radius = PS_MAX (radius, 1.0); + + // construct a source, with model flux pixels set, based on the model + pmSource *source = pmSourceFromModel (model, readout, radius, PM_SOURCE_TYPE_STAR); + + // insert the source flux in the image. dX,dY is the coordinate of + // the readout 0,0 pixel in the chip frame. + pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY); + +** given a pmSource, generate the its cached model flux: + + // this fills in the pixels in the image source->modelFlux + pmSourceCacheModel (source, maskVal); + Index: /branches/eam_branch_20070817/psphot/doc/notes.txt =================================================================== --- /branches/eam_branch_20070817/psphot/doc/notes.txt (revision 14619) +++ /branches/eam_branch_20070817/psphot/doc/notes.txt (revision 14620) @@ -1,2 +1,49 @@ + +2007.08.17 + + I am working on a number of cleanup / fixes. I have made an overhaul + of the pmModel APIs, adding function pointers in the pmModel + structure to the class-specific utility functions (eg, + pmModel->modelFunc is the actual function which is evaluated). + + TO DO: + + * update pmSourceFitSet to be able to include more than one model + type (currently it assumes the sources are all, eg, PSFs). This is + now needed because the old implementation used the function lookups + which have been dropped. + + * define a generic API set to handle 2D modelling of a scalar using + either polynomials (as the pmPSF code currently does) or an + image-based representation (as the psphot sky model currently + does). + + The image-based representation can automatically step down from NxM + super pixels to a smaller number based on the density of + measurements. + + Include ways to smooth and regularize the output result. + + This mechanism can be applied to: psf parameters, aperture + residual, psf peak-to-flux variations, the psphot background + representation. + + * generate and store the output radial profile for objects + + * finish testing and incorportate the CR / EXT measurements + + * adjustments to pixel center based on second derivatives : needed + for the sersic models. + + * adjustments to pixel flux for extreme values (r ~ 0) : needed for + the sersic models. + + * on psf stars : fall back on a Gaussian. + + * OPTIMIZATIONS !! + + * drop the model sky element : should only be in source->sky,dsky + +2006.11.16 ensemble: @@ -20,6 +67,4 @@ * solve for source amplitudes * update models - -2006.11.16 * create psSparseBorder to solve matrix equations which have a large Index: /trunk/ppImage/notes.txt =================================================================== --- /trunk/ppImage/notes.txt (revision 14620) +++ /trunk/ppImage/notes.txt (revision 14620) @@ -0,0 +1,23 @@ + +ppImage pmFPAfiles: + + pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT"); + pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.MASK", "INPUT.MASK"); + pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.WEIGHT", "INPUT.WEIGHT"); + pmFPAfile *output = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT"); + pmFPAfile *outMask = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT.MASK"); + pmFPAfile *outWeight = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT.WEIGHT"); + pmFPAfile *chipImage = pmFPAfileDefineChipMosaic(config, input->fpa, "PPIMAGE.CHIP"); + pmFPAfile *chipMask = pmFPAfileDefineOutput(config, chipImage->fpa, "PPIMAGE.CHIP.MASK"); + pmFPAfile *chipWeight = pmFPAfileDefineOutput(config, chipImage->fpa, "PPIMAGE.CHIP.WEIGHT"); + pmFPAfile *byFPA1 = pmFPAfileDefineFPAMosaic(config, input->fpa, "PPIMAGE.OUTPUT.FPA1"); + pmFPAfile *byFPA2 = pmFPAfileDefineFPAMosaic(config, input->fpa, "PPIMAGE.OUTPUT.FPA2"); + + pmFPAfile *psphotInput = pmFPAfileDefineFromFPA (config, chipImage->fpa, 1, 1, "PSPHOT.INPUT"); + pmFPAfile *psphotOutput = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT"); + pmFPAfile *psastroInput = pmFPAfileDefineInput (config, psphotOutput->fpa, "PSASTRO.INPUT"); + + pmFPAfile *bin1 = pmFPAfileDefineFromFPA (config, chipImage->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1"); + pmFPAfile *bin2 = pmFPAfileDefineFromFPA (config, chipImage->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2"); + pmFPAfile *jpg1 = pmFPAfileDefineOutput (config, byFPA1->fpa, "PPIMAGE.JPEG1"); + pmFPAfile *jpg2 = pmFPAfileDefineOutput (config, byFPA2->fpa, "PPIMAGE.JPEG2");