Index: trunk/psModules/src/objects/pmPSF.c =================================================================== --- trunk/psModules/src/objects/pmPSF.c (revision 6511) +++ trunk/psModules/src/objects/pmPSF.c (revision 6873) @@ -6,6 +6,6 @@ * @author EAM, IfA * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-04 01:01:33 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-04-17 18:10:08 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,11 @@ #include -#include "pmObjects.h" +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmPeaks.h" +#include "pmMoments.h" +#include "pmModel.h" +#include "pmSource.h" +#include "pmGrowthCurve.h" #include "pmPSF.h" #include "pmModelGroup.h" @@ -57,4 +63,6 @@ return; + psFree (psf->ApTrend); + psFree (psf->growth); psFree (psf->params); return; @@ -69,8 +77,8 @@ X-center Y-center - ???: Sky background value? - ???: Zo? + Sky background value + Object Normalization *****************************************************************************/ -pmPSF *pmPSFAlloc (pmModelType type) +pmPSF *pmPSFAlloc (pmModelType type, bool poissonErrors) { int Nparams; @@ -83,4 +91,19 @@ psf->dApResid = 0.0; psf->skyBias = 0.0; + psf->skySat = 0.0; + psf->poissonErrors = poissonErrors; + + // the ApTrend components are (x, y, r2rflux, flux) + psf->ApTrend = psPolynomial4DAlloc (PS_POLYNOMIAL_ORD, 2, 2, 1, 1); + pmPSF_MaskApTrend (psf, PM_PSF_SKYBIAS); + + if (psf->poissonErrors) { + psf->ChiTrend = psPolynomial1DAlloc (PS_POLYNOMIAL_ORD, 1); + } else { + psf->ChiTrend = psPolynomial1DAlloc (PS_POLYNOMIAL_ORD, 2); + } + + // don't define a growth curve : user needs to choose radius bins + psf->growth = NULL; Nparams = pmModelParameterCount (type); @@ -94,5 +117,5 @@ for (int i = 0; i < psf->params->n; i++) { // XXX EAM : make this a user-defined value? - psf->params->data[i] = psPolynomial2DAlloc(1, 1, PS_POLYNOMIAL_ORD); + psf->params->data[i] = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, 1); } @@ -174,11 +197,11 @@ /***************************************************************************** -pmModelFromPSF (*modelFLT, *psf): use the model position parameters to +pmModelFromPSF (*modelEXT, *psf): use the model position parameters to construct a realization of the PSF model at the object coordinates *****************************************************************************/ -pmModel *pmModelFromPSF (pmModel *modelFLT, pmPSF *psf) -{ - - // need to define the relationship between the modelFLT and modelPSF ? +pmModel *pmModelFromPSF (pmModel *modelEXT, pmPSF *psf) +{ + + // need to define the relationship between the modelEXT and modelPSF ? // find function used to set the model parameters @@ -189,6 +212,104 @@ // set model parameters for this source based on PSF information - modelFromPSFFunc (modelPSF, modelFLT, psf); + modelFromPSFFunc (modelPSF, modelEXT, psf); return (modelPSF); } + +// zero and mask out all terms: +static bool maskAllTerms (psPolynomial4D *trend) +{ + + for (int i = 0; i < trend->nX + 1; i++) { + for (int j = 0; j < trend->nY + 1; j++) { + for (int k = 0; k < trend->nZ + 1; k++) { + for (int m = 0; m < trend->nT + 1; m++) { + trend->mask[i][j][k][m] = 1; // mask coeff + trend->coeff[i][j][k][m] = 0; // zero coeff + } + } + } + } + return true; +} + +/*********************************************** + * this function masks the psf.ApTrend polynomial + * to enable the specific subset of the coefficients + **********************************************/ +bool pmPSF_MaskApTrend (pmPSF *psf, pmPSF_ApTrendOptions option) +{ + + switch (option) { + case PM_PSF_NONE: + maskAllTerms (psf->ApTrend); + return true; + + case PM_PSF_CONSTANT: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + return true; + + case PM_PSF_SKYBIAS: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[0][0][1][0] = 0; // unmask skybias + return true; + + case PM_PSF_SKYSAT: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[0][0][1][0] = 0; // unmask skybias + psf->ApTrend->mask[0][0][0][1] = 0; // unmask skybias + return true; + + case PM_PSF_XY_LIN: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[1][0][0][0] = 0; // unmask x + psf->ApTrend->mask[0][1][0][0] = 0; // unmask y + return true; + + case PM_PSF_XY_QUAD: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[1][0][0][0] = 0; // unmask x + psf->ApTrend->mask[2][0][0][0] = 0; // unmask x^2 + psf->ApTrend->mask[1][1][0][0] = 0; // unmask x y + psf->ApTrend->mask[0][1][0][0] = 0; // unmask y + psf->ApTrend->mask[0][2][0][0] = 0; // unmask y^2 + return true; + + case PM_PSF_SKY_XY_LIN: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[1][0][0][0] = 0; // unmask x + psf->ApTrend->mask[0][1][0][0] = 0; // unmask y + psf->ApTrend->mask[0][0][1][0] = 0; // unmask skybias + return true; + + case PM_PSF_SKYSAT_XY_LIN: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[1][0][0][0] = 0; // unmask x + psf->ApTrend->mask[0][1][0][0] = 0; // unmask y + psf->ApTrend->mask[0][0][1][0] = 0; // unmask skybias + psf->ApTrend->mask[0][0][0][1] = 0; // unmask skysat + return true; + + case PM_PSF_ALL: + default: + maskAllTerms (psf->ApTrend); + psf->ApTrend->mask[0][0][0][0] = 0; // unmask constant + psf->ApTrend->mask[0][0][1][0] = 0; // unmask skybias + psf->ApTrend->mask[0][0][0][1] = 0; // unmask skysat + + psf->ApTrend->mask[1][0][0][0] = 0; // unmask x + psf->ApTrend->mask[2][0][0][0] = 0; // unmask x^2 + psf->ApTrend->mask[1][1][0][0] = 0; // unmask x y + psf->ApTrend->mask[0][1][0][0] = 0; // unmask y + psf->ApTrend->mask[0][2][0][0] = 0; // unmask y^2 + return true; + } + return false; +}