Index: trunk/psModules/src/objects/pmModel.c =================================================================== --- trunk/psModules/src/objects/pmModel.c (revision 36858) +++ trunk/psModules/src/objects/pmModel.c (revision 36859) @@ -33,6 +33,6 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" -#include "pmModelClass.h" static void modelFree(pmModel *tmp) @@ -92,13 +92,15 @@ } - tmp->modelFunc = class->modelFunc; - tmp->modelFlux = class->modelFlux; - tmp->modelRadius = class->modelRadius; - tmp->modelLimits = class->modelLimits; - tmp->modelGuess = class->modelGuess; - tmp->modelFromPSF = class->modelFromPSF; - tmp->modelParamsFromPSF = class->modelParamsFromPSF; - tmp->modelFitStatus = class->modelFitStatus; - tmp->modelSetLimits = class->modelSetLimits; + tmp->class = class; + + // tmp->modelFunc = class->modelFunc; + // tmp->modelFlux = class->modelFlux; + // tmp->modelRadius = class->modelRadius; + // tmp->modelLimits = class->modelLimits; + // tmp->modelGuess = class->modelGuess; + // tmp->modelFromPSF = class->modelFromPSF; + // tmp->modelParamsFromPSF = class->modelParamsFromPSF; + // tmp->modelFitStatus = class->modelFitStatus; + // tmp->modelSetLimits = class->modelSetLimits; psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); @@ -158,5 +160,5 @@ psF32 tmpF; - tmpF = model->modelFunc (NULL, model->params, x); + tmpF = model->class->modelFunc (NULL, model->params, x); psFree(x); psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); @@ -178,5 +180,5 @@ psF32 tmpF; - tmpF = model->modelFunc (NULL, model->params, x); + tmpF = model->class->modelFunc (NULL, model->params, x); psFree(x); psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); @@ -285,5 +287,5 @@ // add in the desired components for this coordinate if (mode & PM_MODEL_OP_FUNC) { - pixelValue += model->modelFunc (NULL, params, x); + pixelValue += model->class->modelFunc (NULL, params, x); } Index: trunk/psModules/src/objects/pmModel.h =================================================================== --- trunk/psModules/src/objects/pmModel.h (revision 36858) +++ trunk/psModules/src/objects/pmModel.h (revision 36859) @@ -47,14 +47,17 @@ bool isPCM; ///< is this model fitted with PSF-convolution? + pmModelClass *class; + // functions for this model which depend on the model class - pmModelFunc modelFunc; - pmModelFlux modelFlux; - pmModelRadius modelRadius; - pmModelLimits modelLimits; - pmModelGuessFunc modelGuess; - pmModelFromPSFFunc modelFromPSF; - pmModelParamsFromPSF modelParamsFromPSF; - pmModelFitStatusFunc modelFitStatus; - pmModelSetLimitsFunc modelSetLimits; + + // pmModelFunc modelFunc; + // pmModelFlux modelFlux; + // pmModelRadius modelRadius; + // pmModelLimits modelLimits; + // pmModelGuessFunc modelGuess; + // pmModelFromPSFFunc modelFromPSF; + // pmModelParamsFromPSF modelParamsFromPSF; + // pmModelFitStatusFunc modelFitStatus; + // pmModelSetLimitsFunc modelSetLimits; }; Index: trunk/psModules/src/objects/pmModelClass.c =================================================================== --- trunk/psModules/src/objects/pmModelClass.c (revision 36858) +++ trunk/psModules/src/objects/pmModelClass.c (revision 36859) @@ -33,7 +33,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmErrorCodes.h" @@ -54,13 +54,13 @@ static pmModelClass defaultModels[] = { - {"PS_MODEL_GAUSS", 7, (pmModelFunc)pmModelFunc_GAUSS, (pmModelFlux)pmModelFlux_GAUSS, (pmModelRadius)pmModelRadius_GAUSS, (pmModelLimits)pmModelLimits_GAUSS, (pmModelGuessFunc)pmModelGuess_GAUSS, (pmModelFromPSFFunc)pmModelFromPSF_GAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_GAUSS, (pmModelFitStatusFunc)pmModelFitStatus_GAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_GAUSS }, - {"PS_MODEL_PGAUSS", 7, (pmModelFunc)pmModelFunc_PGAUSS, (pmModelFlux)pmModelFlux_PGAUSS, (pmModelRadius)pmModelRadius_PGAUSS, (pmModelLimits)pmModelLimits_PGAUSS, (pmModelGuessFunc)pmModelGuess_PGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_PGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_PGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_PGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_PGAUSS }, - {"PS_MODEL_QGAUSS", 8, (pmModelFunc)pmModelFunc_QGAUSS, (pmModelFlux)pmModelFlux_QGAUSS, (pmModelRadius)pmModelRadius_QGAUSS, (pmModelLimits)pmModelLimits_QGAUSS, (pmModelGuessFunc)pmModelGuess_QGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_QGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_QGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_QGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_QGAUSS }, - {"PS_MODEL_PS1_V1", 8, (pmModelFunc)pmModelFunc_PS1_V1, (pmModelFlux)pmModelFlux_PS1_V1, (pmModelRadius)pmModelRadius_PS1_V1, (pmModelLimits)pmModelLimits_PS1_V1, (pmModelGuessFunc)pmModelGuess_PS1_V1, (pmModelFromPSFFunc)pmModelFromPSF_PS1_V1, (pmModelParamsFromPSF)pmModelParamsFromPSF_PS1_V1, (pmModelFitStatusFunc)pmModelFitStatus_PS1_V1, (pmModelSetLimitsFunc)pmModelSetLimits_PS1_V1 }, - {"PS_MODEL_RGAUSS", 8, (pmModelFunc)pmModelFunc_RGAUSS, (pmModelFlux)pmModelFlux_RGAUSS, (pmModelRadius)pmModelRadius_RGAUSS, (pmModelLimits)pmModelLimits_RGAUSS, (pmModelGuessFunc)pmModelGuess_RGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_RGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_RGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_RGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_RGAUSS }, - {"PS_MODEL_SERSIC", 8, (pmModelFunc)pmModelFunc_SERSIC, (pmModelFlux)pmModelFlux_SERSIC, (pmModelRadius)pmModelRadius_SERSIC, (pmModelLimits)pmModelLimits_SERSIC, (pmModelGuessFunc)pmModelGuess_SERSIC, (pmModelFromPSFFunc)pmModelFromPSF_SERSIC, (pmModelParamsFromPSF)pmModelParamsFromPSF_SERSIC, (pmModelFitStatusFunc)pmModelFitStatus_SERSIC, (pmModelSetLimitsFunc)pmModelSetLimits_SERSIC }, - {"PS_MODEL_EXP", 7, (pmModelFunc)pmModelFunc_EXP, (pmModelFlux)pmModelFlux_EXP, (pmModelRadius)pmModelRadius_EXP, (pmModelLimits)pmModelLimits_EXP, (pmModelGuessFunc)pmModelGuess_EXP, (pmModelFromPSFFunc)pmModelFromPSF_EXP, (pmModelParamsFromPSF)pmModelParamsFromPSF_EXP, (pmModelFitStatusFunc)pmModelFitStatus_EXP, (pmModelSetLimitsFunc)pmModelSetLimits_EXP }, - {"PS_MODEL_DEV", 7, (pmModelFunc)pmModelFunc_DEV, (pmModelFlux)pmModelFlux_DEV, (pmModelRadius)pmModelRadius_DEV, (pmModelLimits)pmModelLimits_DEV, (pmModelGuessFunc)pmModelGuess_DEV, (pmModelFromPSFFunc)pmModelFromPSF_DEV, (pmModelParamsFromPSF)pmModelParamsFromPSF_DEV, (pmModelFitStatusFunc)pmModelFitStatus_DEV, (pmModelSetLimitsFunc)pmModelSetLimits_DEV }, - {"PS_MODEL_TRAIL", 7, (pmModelFunc)pmModelFunc_TRAIL, (pmModelFlux)pmModelFlux_TRAIL, (pmModelRadius)pmModelRadius_TRAIL, (pmModelLimits)pmModelLimits_TRAIL, (pmModelGuessFunc)pmModelGuess_TRAIL, (pmModelFromPSFFunc)pmModelFromPSF_TRAIL, (pmModelParamsFromPSF)pmModelParamsFromPSF_TRAIL, (pmModelFitStatusFunc)pmModelFitStatus_TRAIL, (pmModelSetLimitsFunc)pmModelSetLimits_TRAIL }, + {"PS_MODEL_GAUSS", 7, 0, (pmModelFunc)pmModelFunc_GAUSS, (pmModelFlux)pmModelFlux_GAUSS, (pmModelRadius)pmModelRadius_GAUSS, (pmModelSetFWHM)pmModelSetFWHM_GAUSS, (pmModelLimits)pmModelLimits_GAUSS, (pmModelGuessFunc)pmModelGuess_GAUSS, (pmModelFromPSFFunc)pmModelFromPSF_GAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_GAUSS, (pmModelFitStatusFunc)pmModelFitStatus_GAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_GAUSS }, + {"PS_MODEL_PGAUSS", 7, 0, (pmModelFunc)pmModelFunc_PGAUSS, (pmModelFlux)pmModelFlux_PGAUSS, (pmModelRadius)pmModelRadius_PGAUSS, (pmModelSetFWHM)pmModelSetFWHM_PGAUSS, (pmModelLimits)pmModelLimits_PGAUSS, (pmModelGuessFunc)pmModelGuess_PGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_PGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_PGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_PGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_PGAUSS }, + {"PS_MODEL_QGAUSS", 8, 0, (pmModelFunc)pmModelFunc_QGAUSS, (pmModelFlux)pmModelFlux_QGAUSS, (pmModelRadius)pmModelRadius_QGAUSS, (pmModelSetFWHM)pmModelSetFWHM_QGAUSS, (pmModelLimits)pmModelLimits_QGAUSS, (pmModelGuessFunc)pmModelGuess_QGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_QGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_QGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_QGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_QGAUSS }, + {"PS_MODEL_PS1_V1", 8, 0, (pmModelFunc)pmModelFunc_PS1_V1, (pmModelFlux)pmModelFlux_PS1_V1, (pmModelRadius)pmModelRadius_PS1_V1, (pmModelSetFWHM)pmModelSetFWHM_PS1_V1, (pmModelLimits)pmModelLimits_PS1_V1, (pmModelGuessFunc)pmModelGuess_PS1_V1, (pmModelFromPSFFunc)pmModelFromPSF_PS1_V1, (pmModelParamsFromPSF)pmModelParamsFromPSF_PS1_V1, (pmModelFitStatusFunc)pmModelFitStatus_PS1_V1, (pmModelSetLimitsFunc)pmModelSetLimits_PS1_V1 }, + {"PS_MODEL_RGAUSS", 8, 0, (pmModelFunc)pmModelFunc_RGAUSS, (pmModelFlux)pmModelFlux_RGAUSS, (pmModelRadius)pmModelRadius_RGAUSS, (pmModelSetFWHM)pmModelSetFWHM_RGAUSS, (pmModelLimits)pmModelLimits_RGAUSS, (pmModelGuessFunc)pmModelGuess_RGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_RGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_RGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_RGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_RGAUSS }, + {"PS_MODEL_SERSIC", 8, 1, (pmModelFunc)pmModelFunc_SERSIC, (pmModelFlux)pmModelFlux_SERSIC, (pmModelRadius)pmModelRadius_SERSIC, (pmModelSetFWHM)pmModelSetFWHM_SERSIC, (pmModelLimits)pmModelLimits_SERSIC, (pmModelGuessFunc)pmModelGuess_SERSIC, (pmModelFromPSFFunc)pmModelFromPSF_SERSIC, (pmModelParamsFromPSF)pmModelParamsFromPSF_SERSIC, (pmModelFitStatusFunc)pmModelFitStatus_SERSIC, (pmModelSetLimitsFunc)pmModelSetLimits_SERSIC }, + {"PS_MODEL_EXP", 7, 1, (pmModelFunc)pmModelFunc_EXP, (pmModelFlux)pmModelFlux_EXP, (pmModelRadius)pmModelRadius_EXP, (pmModelSetFWHM)pmModelSetFWHM_EXP, (pmModelLimits)pmModelLimits_EXP, (pmModelGuessFunc)pmModelGuess_EXP, (pmModelFromPSFFunc)pmModelFromPSF_EXP, (pmModelParamsFromPSF)pmModelParamsFromPSF_EXP, (pmModelFitStatusFunc)pmModelFitStatus_EXP, (pmModelSetLimitsFunc)pmModelSetLimits_EXP }, + {"PS_MODEL_DEV", 7, 1, (pmModelFunc)pmModelFunc_DEV, (pmModelFlux)pmModelFlux_DEV, (pmModelRadius)pmModelRadius_DEV, (pmModelSetFWHM)pmModelSetFWHM_DEV, (pmModelLimits)pmModelLimits_DEV, (pmModelGuessFunc)pmModelGuess_DEV, (pmModelFromPSFFunc)pmModelFromPSF_DEV, (pmModelParamsFromPSF)pmModelParamsFromPSF_DEV, (pmModelFitStatusFunc)pmModelFitStatus_DEV, (pmModelSetLimitsFunc)pmModelSetLimits_DEV }, + {"PS_MODEL_TRAIL", 7, 0, (pmModelFunc)pmModelFunc_TRAIL, (pmModelFlux)pmModelFlux_TRAIL, (pmModelRadius)pmModelRadius_TRAIL, (pmModelSetFWHM)pmModelSetFWHM_TRAIL, (pmModelLimits)pmModelLimits_TRAIL, (pmModelGuessFunc)pmModelGuess_TRAIL, (pmModelFromPSFFunc)pmModelFromPSF_TRAIL, (pmModelParamsFromPSF)pmModelParamsFromPSF_TRAIL, (pmModelFitStatusFunc)pmModelFitStatus_TRAIL, (pmModelSetLimitsFunc)pmModelSetLimits_TRAIL }, }; Index: trunk/psModules/src/objects/pmModelClass.h =================================================================== --- trunk/psModules/src/objects/pmModelClass.h (revision 36858) +++ trunk/psModules/src/objects/pmModelClass.h (revision 36859) @@ -35,7 +35,9 @@ char *name; int nParams; + bool useReff; pmModelFunc modelFunc; pmModelFlux modelFlux; pmModelRadius modelRadius; + pmModelSetFWHM modelSetFWHM; pmModelLimits modelLimits; pmModelGuessFunc modelGuess; Index: trunk/psModules/src/objects/pmModelUtils.c =================================================================== --- trunk/psModules/src/objects/pmModelUtils.c (revision 36858) +++ trunk/psModules/src/objects/pmModelUtils.c (revision 36859) @@ -32,7 +32,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -46,13 +46,4 @@ #include "pmErrorCodes.h" -// XX static bool useModelVar = false; -// XX -// XX void pmModelSetModelVarOption (bool option) { -// XX useModelVar = option; -// XX } -// XX bool pmModelGetModelVarOption (void) { -// XX return useModelVar; -// XX } - /***************************************************************************** pmModelFromPSF (*modelEXT, *psf): use the model position parameters to @@ -68,5 +59,5 @@ // set model parameters for this source based on PSF information - if (!modelEXT->modelFromPSF (modelPSF, modelEXT, psf)) { + if (!modelEXT->class->modelFromPSF (modelPSF, modelEXT, psf)) { psTrace ("psModules.objects", 3, "Failed to set model params from PSF"); psFree(modelPSF); @@ -89,5 +80,5 @@ // set model parameters for this source based on PSF information - if (!modelPSF->modelParamsFromPSF (modelPSF, psf, Xo, Yo, Io)) { + if (!modelPSF->class->modelParamsFromPSF (modelPSF, psf, Xo, Yo, Io)) { psFree(modelPSF); return NULL; @@ -109,5 +100,5 @@ // determine the normalized flux - float normFlux = model->modelFlux (model->params); + float normFlux = model->class->modelFlux (model->params); assert (isfinite(normFlux)); assert (normFlux > 0); @@ -120,8 +111,8 @@ bool pmModelUseReff (pmModelType type) { - bool useReff = false; - useReff |= (type == pmModelClassGetType ("PS_MODEL_SERSIC")); - useReff |= (type == pmModelClassGetType ("PS_MODEL_DEV")); - useReff |= (type == pmModelClassGetType ("PS_MODEL_EXP")); + + pmModelClass *class = pmModelClassSelect (type); + psAssert (class, "undefined model class?"); + bool useReff = class->useReff; return useReff; } Index: trunk/psModules/src/objects/pmPCM_MinimizeChisq.c =================================================================== --- trunk/psModules/src/objects/pmPCM_MinimizeChisq.c (revision 36858) +++ trunk/psModules/src/objects/pmPCM_MinimizeChisq.c (revision 36859) @@ -31,7 +31,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -455,5 +455,5 @@ coord->data.F32[1] = (psF32) (i + 0.5 + source->pixels->row0); - pcm->modelFlux->data.F32[i][j] = pcm->modelConv->modelFunc (deriv, params, coord); + pcm->modelFlux->data.F32[i][j] = pcm->modelConv->class->modelFunc (deriv, params, coord); for (int n = 0; n < params->n; n++) { Index: trunk/psModules/src/objects/pmPCMdata.c =================================================================== --- trunk/psModules/src/objects/pmPCMdata.c (revision 36858) +++ trunk/psModules/src/objects/pmPCMdata.c (revision 36859) @@ -31,7 +31,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -293,5 +293,5 @@ psEllipseAxes axes; - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; psF32 *PAR = modelPSF->params->data.F32; pmModelParamsToAxes (&axes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], useReff); @@ -302,5 +302,5 @@ // XXX need to do this more carefully if (modelPSF->type == modelType_GAUSS) { - float FWHM_MAJOR = 2*modelPSF->modelRadius (modelPSF->params, 0.5*PAR[PM_PAR_I0]); + float FWHM_MAJOR = 2*modelPSF->class->modelRadius (modelPSF->params, 0.5*PAR[PM_PAR_I0]); float FWHM_MINOR = FWHM_MAJOR * (axes.minor / axes.major); *sigma = 0.50 * (FWHM_MAJOR + FWHM_MINOR) / 2.35; @@ -330,5 +330,5 @@ psEllipseAxes axes; - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; psF32 *PAR = modelPSF->params->data.F32; pmModelParamsToAxes (&axes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], useReff); @@ -339,5 +339,5 @@ // XXX need to do this more carefully if (modelPSF->type == modelType_GAUSS) { - float FWHM_MAJOR = 2*modelPSF->modelRadius (modelPSF->params, 0.5*PAR[PM_PAR_I0]); + float FWHM_MAJOR = 2*modelPSF->class->modelRadius (modelPSF->params, 0.5*PAR[PM_PAR_I0]); float FWHM_MINOR = FWHM_MAJOR * (axes.minor / axes.major); *sigma = 0.50 * (FWHM_MAJOR + FWHM_MINOR) / 2.35; @@ -393,5 +393,5 @@ psMinConstraint *constraint = psMinConstraintAlloc(); constraint->paramMask = psVectorAlloc (params->n, PS_TYPE_VECTOR_MASK); - constraint->checkLimits = model->modelLimits; + constraint->checkLimits = model->class->modelLimits; int nParams = pmPCMsetParams (constraint, fitOptions->mode); Index: trunk/psModules/src/objects/pmPSF.c =================================================================== --- trunk/psModules/src/objects/pmPSF.c (revision 36858) +++ trunk/psModules/src/objects/pmPSF.c (revision 36859) @@ -37,7 +37,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -329,5 +329,5 @@ // convert the parameters used in the fitted source model to the psEllipseAxes representation // (major,minor,theta) -psEllipseAxes pmPSF_ModelToAxes (psF32 *modelPar, pmModelType type) +psEllipseAxes pmPSF_ModelToAxes (psF32 *modelPar, bool useReff) { psEllipseAxes axes; @@ -338,5 +338,4 @@ PS_ASSERT_PTR_NON_NULL(modelPar, axes); - bool useReff = pmModelUseReff (type); pmModelParamsToAxes (&axes, modelPar[PM_PAR_SXX], modelPar[PM_PAR_SXY], modelPar[PM_PAR_SYY], useReff); return axes; @@ -345,5 +344,5 @@ // convert the psEllipseAxes representation (major,minor,theta) to the parameters used in the // fitted source model -bool pmPSF_AxesToModel (psF32 *modelPar, psEllipseAxes axes, pmModelType type) +bool pmPSF_AxesToModel (psF32 *modelPar, psEllipseAxes axes, bool useReff) { PS_ASSERT_PTR_NON_NULL(modelPar, false); @@ -357,5 +356,4 @@ } - bool useReff = pmModelUseReff (type); pmModelAxesToParams (&modelPar[PM_PAR_SXX], &modelPar[PM_PAR_SXY], &modelPar[PM_PAR_SYY], axes, useReff); return true; @@ -420,9 +418,9 @@ // get the model full-width at half-max - float fwhmMajor = 2*model->modelRadius (model->params, 0.5); + float fwhmMajor = 2*model->class->modelRadius (model->params, 0.5); # if (0) psF32 *params = model->params->data.F32; // Model parameters - psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO, model->type); // Ellipse axes + psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO, model->class->useReff); // Ellipse axes // Curiously, the minor axis can be larger than the major axis, so need to check. Index: trunk/psModules/src/objects/pmSourceFitModel.c =================================================================== --- trunk/psModules/src/objects/pmSourceFitModel.c (revision 36858) +++ trunk/psModules/src/objects/pmSourceFitModel.c (revision 36859) @@ -33,7 +33,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -170,5 +170,5 @@ psMinConstraint *constraint = psMinConstraintAlloc(); constraint->paramMask = psVectorAlloc (params->n, PS_TYPE_VECTOR_MASK); - constraint->checkLimits = model->modelLimits; + constraint->checkLimits = model->class->modelLimits; // set parameter mask based on fitting mode @@ -233,6 +233,6 @@ // force the floating parameters to fall within the contraint ranges for (int i = 0; i < params->n; i++) { - model->modelLimits (PS_MINIMIZE_PARAM_MIN, i, params->data.F32, NULL); - model->modelLimits (PS_MINIMIZE_PARAM_MAX, i, params->data.F32, NULL); + model->class->modelLimits (PS_MINIMIZE_PARAM_MIN, i, params->data.F32, NULL); + model->class->modelLimits (PS_MINIMIZE_PARAM_MAX, i, params->data.F32, NULL); } @@ -254,5 +254,5 @@ psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32); - fitStatus = psMinimizeLMChi2(myMin, covar, params, constraint, x, y, yErr, model->modelFunc); + fitStatus = psMinimizeLMChi2(myMin, covar, params, constraint, x, y, yErr, model->class->modelFunc); for (int i = 0; i < dparams->n; i++) { if ((constraint->paramMask != NULL) && constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) @@ -306,5 +306,5 @@ altmask->data.PS_TYPE_VECTOR_MASK_DATA[i] = (constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) ? 0 : 1; } - psMinimizeGaussNewtonDelta(delta, params, altmask, x, y, yErr, model->modelFunc); + psMinimizeGaussNewtonDelta(delta, params, altmask, x, y, yErr, model->class->modelFunc); for (int i = 0; i < dparams->n; i++) { Index: trunk/psModules/src/objects/pmSourceFitPCM.c =================================================================== --- trunk/psModules/src/objects/pmSourceFitPCM.c (revision 36858) +++ trunk/psModules/src/objects/pmSourceFitPCM.c (revision 36859) @@ -31,7 +31,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -63,6 +63,6 @@ // force the floating parameters to fall within the contraint ranges for (int i = 0; i < params->n; i++) { - pcm->modelConv->modelLimits (PS_MINIMIZE_PARAM_MIN, i, params->data.F32, NULL); - pcm->modelConv->modelLimits (PS_MINIMIZE_PARAM_MAX, i, params->data.F32, NULL); + pcm->modelConv->class->modelLimits (PS_MINIMIZE_PARAM_MIN, i, params->data.F32, NULL); + pcm->modelConv->class->modelLimits (PS_MINIMIZE_PARAM_MAX, i, params->data.F32, NULL); } @@ -165,5 +165,5 @@ bool pmSourceModelGuessPCM (pmPCMdata *pcm, pmSource *source, psImageMaskType maskVal, psImageMaskType markVal) { - if (!pcm->modelConv->modelGuess(pcm->modelConv, source, maskVal, markVal)) { + if (!pcm->modelConv->class->modelGuess(pcm->modelConv, source, maskVal, markVal)) { return false; } Index: trunk/psModules/src/objects/pmSourceFitSet.c =================================================================== --- trunk/psModules/src/objects/pmSourceFitSet.c (revision 36858) +++ trunk/psModules/src/objects/pmSourceFitSet.c (revision 36859) @@ -32,7 +32,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -223,5 +223,5 @@ float *paramOne = params + nParamBase; float *betaOne = betas + nParamBase; - bool status = model->modelLimits (mode, nParamOne, paramOne, betaOne); + bool status = model->class->modelLimits (mode, nParamOne, paramOne, betaOne); return status; } @@ -388,5 +388,5 @@ psVector *derivOne = thisSet->derivSet->data[i]; - chisqOne = model->modelFunc (derivOne, paramOne, x); + chisqOne = model->class->modelFunc (derivOne, paramOne, x); chisqSum += chisqOne; } Index: trunk/psModules/src/objects/pmSourceUtils.c =================================================================== --- trunk/psModules/src/objects/pmSourceUtils.c (revision 36858) +++ trunk/psModules/src/objects/pmSourceUtils.c (revision 36859) @@ -34,7 +34,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -65,5 +65,5 @@ pmModel *model = pmModelAlloc(modelType); - if (!model->modelGuess(model, source, maskVal, markVal)) { + if (!model->class->modelGuess(model, source, maskVal, markVal)) { psFree (model); return NULL;