Index: branches/eam_branches/ipp-20140610/psModules/src/camera/pmFPAfileIO.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/camera/pmFPAfileIO.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/camera/pmFPAfileIO.c (revision 36884) @@ -34,4 +34,5 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmSourceMasks.h" Index: branches/eam_branches/ipp-20140610/psModules/src/camera/pmReadoutFake.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/camera/pmReadoutFake.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/camera/pmReadoutFake.c (revision 36884) @@ -20,7 +20,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" @@ -55,5 +55,5 @@ psF32 *params = model->params->data.F32; // Model parameters - psEllipseAxes axes = pmPSF_ModelToAxes(params, model->type); // Ellipse axes + psEllipseAxes axes = pmPSF_ModelToAxes(params, model->class->useReff); // Ellipse axes // Curiously, the minor axis can be larger than the major axis, so need to check. if (axes.major >= axes.minor) { @@ -62,5 +62,5 @@ axes.major = axes.minor; } - return pmPSF_AxesToModel(params, axes, model->type); + return pmPSF_AxesToModel(params, axes, model->class->useReff); } @@ -122,5 +122,5 @@ } - flux /= normModel->modelFlux(normModel->params); + flux /= normModel->class->modelFlux(normModel->params); psFree(normModel); } @@ -164,5 +164,5 @@ float fakeRadius = 1.0; // Radius of fake source if (isfinite(minFlux)) { - fakeRadius = PS_MAX(fakeRadius, fakeModel->modelRadius(fakeModel->params, minFlux)); + fakeRadius = PS_MAX(fakeRadius, fakeModel->class->modelRadius(fakeModel->params, minFlux)); } if (radius > 0) { Index: branches/eam_branches/ipp-20140610/psModules/src/extras/pmThreadTools.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/extras/pmThreadTools.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/extras/pmThreadTools.c (revision 36884) @@ -29,7 +29,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" Index: branches/eam_branches/ipp-20140610/psModules/src/extras/pmVisual.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/extras/pmVisual.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/extras/pmVisual.c (revision 36884) @@ -22,33 +22,5 @@ bool pmSourceVisualClose(void); -// #include "pmHDU.h" -// #include "pmFPA.h" -// #include "pmFPAfile.h" -// #include "pmAstrometryObjects.h" -// #include "pmSubtractionStamps.h" -// #include "pmTrend2D.h" -// #include "pmResiduals.h" -// #include "pmGrowthCurve.h" -// #include "pmSpan.h" -// #include "pmFootprintSpans.h" -// #include "pmFootprint.h" -// #include "pmPeaks.h" -// #include "pmMoments.h" -// #include "pmModelFuncs.h" -// #include "pmModel.h" -// #include "pmSourceMasks.h" -// #include "pmSourceExtendedPars.h" -// #include "pmSourceDiffStats.h" #include "pmSourceSatstar.h" -// #include "pmSourceLensing.h" -// #include "pmSource.h" -// #include "pmSourceFitModel.h" -// #include "pmPSF.h" -// #include "pmPSFtry.h" -// #include "pmFPAExtent.h" -// #include "pmAstrometryVisual.h" -// #include "pmSubtractionVisual.h" -// #include "pmStackVisual.h" -// #include "pmSourceVisual.h" # if (HAVE_KAPA) Index: branches/eam_branches/ipp-20140610/psModules/src/imcombine/pmPSFEnvelope.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/imcombine/pmPSFEnvelope.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/imcombine/pmPSFEnvelope.c (revision 36884) @@ -20,7 +20,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" @@ -168,9 +168,9 @@ continue; } - model->modelSetLimits(PM_MODEL_LIMITS_MODERATE); + model->class->modelSetLimits(PM_MODEL_LIMITS_MODERATE); bool limits = true; // Model within limits? for (int j = 0; j < model->params->n && limits; j++) { - if (!model->modelLimits(PS_MINIMIZE_PARAM_MIN, j, model->params->data.F32, NULL) || - !model->modelLimits(PS_MINIMIZE_PARAM_MAX, j, model->params->data.F32, NULL)) { + if (!model->class->modelLimits(PS_MINIMIZE_PARAM_MIN, j, model->params->data.F32, NULL) || + !model->class->modelLimits(PS_MINIMIZE_PARAM_MAX, j, model->params->data.F32, NULL)) { limits = false; } @@ -246,5 +246,5 @@ continue; } - float srcRadius = model->modelRadius(model->params, PS_SQR(VARIANCE_VAL)); // Radius for source + float srcRadius = model->class->modelRadius(model->params, PS_SQR(VARIANCE_VAL)); // Radius for source psFree(model); if (srcRadius == 0) { Index: branches/eam_branches/ipp-20140610/psModules/src/imcombine/pmSubtractionStamps.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/imcombine/pmSubtractionStamps.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/imcombine/pmSubtractionStamps.c (revision 36884) @@ -21,4 +21,5 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmSourceMasks.h" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/mksource.pl =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/mksource.pl (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/mksource.pl (revision 36884) @@ -24,7 +24,9 @@ "PS1_DV2", 2, "PS1_DV3", 3, + "PS1_DV4", 4, ); %cmfmodes_sv = ("PS1_SV1", 1, "PS1_SV2", 2, + "PS1_SV3", 3, ); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/fwhm.sh =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/fwhm.sh (revision 36884) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/fwhm.sh (revision 36884) @@ -0,0 +1,218 @@ + +macro find.fwhm.pgauss + if ($0 != 1) + echo "USAGE: find.fwhm" + break + end + + $dz = 0.01 + create z 0 50 $dz + + # Gaussian taylor expansion + # f = 1 / (1 + z + z^2/2 + z^3/6) + # 1 + z + z^2/2 + z^3/6 = 2 + # f = z + z^2/2 + z^3/6 - 2, find where f == 0.0 + + set f = z + 0.5*z^2 + (1/6.0)*z^3 - 2.0 + set dfdz = 1 + z + 0.5*z^2 + + lim -n 0 z f; clear; box; plot z f + lim -n 1 z dfdz; clear; box; plot z dfdz + + $nZ0 = 0 + $nZ1 = 5 / $dz + + $Zg = 0.5*(z[$nZ0] + z[$nZ1]) + $nZg = int($Zg / $dz) + $dZ = 1.0 + + for i 0 10 + $Fg = f[$nZg] + $dFdz_g = dfdz[$nZg] + + $dZ = $Fg / $dFdz_g + + echo $Zg $Fg $dZ $dFdz_g + + $Zg -= $dZ + $Zg = max ($Zg , 0) + $nZg = int($Zg / $dz) + end + echo $Zg $Fg $dZ $dFdz_g + $Zhm = $Zg + $FWHM = 2*sqrt(2*$Zg) + + echo $Zhm : $FWHM +end + +macro find.fwhm.rgauss + if ($0 != 2) + echo "USAGE: find.fwhm (K)" + break + end + + $K = $1 + + if ($K == 0.0) + $Zhm = (sqrt(5) - 1.0) / 2.0 + $FWHM = 2*sqrt(2*$Zhm) + echo $K : $Zhm : $FWHM + return + end + + $dz = 0.01 + create z 0 50 $dz + + # set f = 1.0 / (1.0 + $K*z + z^1.667) + # f = $K*z + z^1.667 - 1.0, find where f == 0.0 + + set f = z + z^$K - 1.0 + set dfdz = ln(z) * z^$K + 1.0 + + lim -n 0 z f; clear; box; plot z f + lim -n 1 z dfdz; clear; box; plot z dfdz + + $nZ0 = 0 + $nZ1 = 5 / $dz + + $Zg = 0.5*(z[$nZ0] + z[$nZ1]) + $nZg = int($Zg / $dz) + $dZ = 1.0 + + for i 0 10 + $Fg = f[$nZg] + $dFdz_g = dfdz[$nZg] + + $dZ = $Fg / $dFdz_g + + echo $nZg $Zg $Fg $dZ $dFdz_g + + $Zg -= $dZ + $Zg = max ($Zg , 0) + $nZg = int($Zg / $dz) + end + # echo $Zg $Fg $dZ $dFdz_g + $Zhm = $Zg + $FWHM = 2*sqrt(2*$Zg) + + echo $K : $Zhm : $FWHM +end + +macro find.fwhm.ps1v1 + if ($0 != 2) + echo "USAGE: find.fwhm (K)" + break + end + + $K = $1 + + if ($K == 0.0) + $Zhm = 1.0 + $FWHM = 2*sqrt(2) + echo $K : $Zhm : $FWHM + return + end + + $dz = 0.01 + create z 0 50 $dz + + # set f = 1.0 / (1.0 + $K*z + z^1.667) + # f = $K*z + z^1.667 - 1.0, find where f == 0.0 + + set f = $K*z + z^1.667 - 1.0 + set dfdz = $K + z^0.667 + + #lim -n 0 z f; clear; box; plot z f + #lim -n 1 z dfdz; clear; box; plot z dfdz + + $nZ0 = 0 + $nZ1 = 5 / $dz + + $Zg = 0.5*(z[$nZ0] + z[$nZ1]) + $nZg = int($Zg / $dz) + $dZ = 1.0 + + for i 0 10 + $Fg = f[$nZg] + $dFdz_g = dfdz[$nZg] + + $dZ = $Fg / $dFdz_g + + # echo $Zg $Fg $dZ $dFdz_g + + $Zg -= $dZ + $Zg = max ($Zg , 0) + $nZg = int($Zg / $dz) + end + # echo $Zg $Fg $dZ $dFdz_g + $Zhm = $Zg + $FWHM = 2*sqrt(2*$Zg) + + echo $K : $Zhm : $FWHM +end + +# qgauss is like ps1_v1 with z^2.25 +macro find.fwhm.qgauss + if ($0 != 2) + echo "USAGE: find.qgauss (K)" + break + end + + $K = $1 + + if ($K == 0.0) + $Zhm = 1.0 + $FWHM = 2*sqrt(2) + echo $K : $Zhm : $FWHM + return + end + + $dz = 0.01 + create z 0 50 $dz + + # set f = 1.0 / (1.0 + $K*z + z^2.25) + # f = $K*z + z^2.25 - 1.0, find where f == 0.0 + + set f = $K*z + z^2.25 - 1.0 + set dfdz = $K + z^1.25 + + #lim -n 0 z f; clear; box; plot z f + #lim -n 1 z dfdz; clear; box; plot z dfdz + + $nZ0 = 0 + $nZ1 = 5 / $dz + + $Zg = 0.5*(z[$nZ0] + z[$nZ1]) + $nZg = int($Zg / $dz) + $dZ = 1.0 + + for i 0 10 + $Fg = f[$nZg] + $dFdz_g = dfdz[$nZg] + + $dZ = $Fg / $dFdz_g + + # echo $Zg $Fg $dZ $dFdz_g + + $Zg -= $dZ + $Zg = max ($Zg , 0) + $nZg = int($Zg / $dz) + end + # echo $Zg $Fg $dZ $dFdz_g + $Zhm = $Zg + $FWHM = 2*sqrt(2*$Zg) + + echo $K : $Zhm : $FWHM +end + +macro fwhm.trend + + delete fwhm_v k_v + + for k 0 20 1.0 + find.fwhm.qgauss $k + concat $k k_v + concat $FWHM fwhm_v + end +end + Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_DEV.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_DEV.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_DEV.c (revision 36884) @@ -36,7 +36,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" @@ -59,4 +59,5 @@ # define PM_MODEL_LIMITS pmModelLimits_DEV # define PM_MODEL_RADIUS pmModelRadius_DEV +# define PM_MODEL_SET_FWHM pmModelSetFWHM_DEV # define PM_MODEL_FROM_PSF pmModelFromPSF_DEV # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_DEV @@ -123,5 +124,5 @@ if (radius <= 1.5) { // Nsub ~ 10*index^2 + 1 - psEllipseAxes axes = pmPSF_ModelToAxes(PAR, pmModelClassGetType ("PS_MODEL_DEV")); + psEllipseAxes axes = pmPSF_ModelToAxes(PAR, true); // DEV uses Reff int Nsub = 2 * ((int)(25 / axes.minor)) + 1; Nsub = PS_MIN (Nsub, 121); @@ -336,4 +337,8 @@ } +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (NAN); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { @@ -357,5 +362,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -411,5 +416,5 @@ // convert to shape terms (SXX,SYY,SXY) // XXX user-defined value for limit? - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_DEV.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_DEV.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_DEV.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_DEV(const psVector *params); psF64 pmModelRadius_DEV(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_DEV(const psVector *params, psF64 flux); bool pmModelFromPSF_DEV(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_DEV(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_EXP.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_EXP.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_EXP.c (revision 36884) @@ -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" @@ -56,4 +56,5 @@ # define PM_MODEL_LIMITS pmModelLimits_EXP # define PM_MODEL_RADIUS pmModelRadius_EXP +# define PM_MODEL_SET_FWHM pmModelSetFWHM_EXP # define PM_MODEL_FROM_PSF pmModelFromPSF_EXP # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_EXP @@ -343,4 +344,8 @@ } +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (NAN); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { @@ -364,5 +369,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -418,5 +423,5 @@ // convert to shape terms (SXX,SYY,SXY) // XXX user-defined value for limit? - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_EXP.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_EXP.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_EXP.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_EXP(const psVector *params); psF64 pmModelRadius_EXP(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_EXP(const psVector *params, psF64 flux); bool pmModelFromPSF_EXP(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_EXP(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_GAUSS.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_GAUSS.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_GAUSS.c (revision 36884) @@ -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" @@ -54,4 +54,5 @@ # define PM_MODEL_GUESS pmModelGuess_GAUSS # define PM_MODEL_LIMITS pmModelLimits_GAUSS +# define PM_MODEL_SET_FWHM pmModelSetFWHM_GAUSS # define PM_MODEL_RADIUS pmModelRadius_GAUSS # define PM_MODEL_FROM_PSF pmModelFromPSF_GAUSS @@ -257,4 +258,8 @@ } +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (2.35482004503*sigma); +} + // construct the PSF model from the FLT model and the psf bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) @@ -279,5 +284,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -331,5 +336,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_GAUSS.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_GAUSS.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_GAUSS.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_GAUSS(const psVector *params); psF64 pmModelRadius_GAUSS(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_GAUSS(const psVector *params, psF64 flux); bool pmModelFromPSF_GAUSS(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_GAUSS(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PGAUSS.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PGAUSS.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PGAUSS.c (revision 36884) @@ -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" @@ -55,4 +55,5 @@ # define PM_MODEL_LIMITS pmModelLimits_PGAUSS # define PM_MODEL_RADIUS pmModelRadius_PGAUSS +# define PM_MODEL_SET_FWHM pmModelSetFWHM_PGAUSS # define PM_MODEL_FROM_PSF pmModelFromPSF_PGAUSS # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_PGAUSS @@ -324,4 +325,9 @@ } +// scale factor is constant for PGAUSS, I found it with the fwhm.sh script +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (3.0063103*sigma); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { @@ -344,5 +350,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -396,5 +402,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PGAUSS.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PGAUSS.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PGAUSS.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_PGAUSS(const psVector *params); psF64 pmModelRadius_PGAUSS(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_PGAUSS(const psVector *params, psF64 flux); bool pmModelFromPSF_PGAUSS(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_PGAUSS(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PS1_V1.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PS1_V1.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PS1_V1.c (revision 36884) @@ -35,7 +35,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" @@ -57,4 +57,5 @@ # define PM_MODEL_LIMITS pmModelLimits_PS1_V1 # define PM_MODEL_RADIUS pmModelRadius_PS1_V1 +# define PM_MODEL_SET_FWHM pmModelSetFWHM_PS1_V1 # define PM_MODEL_FROM_PSF pmModelFromPSF_PS1_V1 # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_PS1_V1 @@ -336,7 +337,54 @@ } +// I used the script in models/fwhm.sh to generate the trend of FWHM scaling vs the K value +// FWHM = Scale * Sigma (not that PAR[PM_PAR_SXX] = sigma * sqrt(2) +// K : z_hm : FWHM +// 0 : 1.000 : 2.83 +// 1 : 0.597 : 2.19 +// 2 : 0.396 : 1.78 +// 3 : 0.291 : 1.53 +// 4 : 0.232 : 1.36 +// 5 : 0.198 : 1.26 +// 6 : 0.169 : 1.16 +// 7 : 0.142 : 1.07 +// 8 : 0.124 : 0.99 +// 9 : 0.118 : 0.97 +// 10 : 0.106 : 0.92 +// 11 : 0.092 : 0.86 +// 12 : 0.091 : 0.85 +// 13 : 0.080 : 0.80 +// 14 : 0.078 : 0.79 +// 15 : 0.073 : 0.76 +// 16 : 0.063 : 0.71 +// 17 : 0.068 : 0.74 +// 18 : 0.056 : 0.67 +// 19 : 0.058 : 0.68 + +// static float PS1_V1_Core[] = { 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0}; +static float PS1_V1_Scale[] = {2.83, 2.19, 1.78, 1.53, 1.36, 1.26, 1.16, 1.07, 0.99, 0.97, 0.92, 0.86, 0.85, 0.80, 0.79, 0.76, 0.71, 0.74, 0.67, 0.68}; + +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + + psF32 *PAR = params->data.F32; + + float core = PAR[PM_PAR_7]; + + if (!isfinite(core)) return (2.0*M_SQRT2*sigma); + + // if PS1_V1_Core is defined as a set of integer steps, so we can simplify: + int binCore = MAX(0, MIN (19, (int)core)); + + float scale = NAN; + if (binCore == 0) { + scale = (core - binCore + 0) * (PS1_V1_Scale[binCore + 1] - PS1_V1_Scale[binCore + 0]) + PS1_V1_Scale[binCore + 0]; + } else { + scale = (core - binCore - 1) * (PS1_V1_Scale[binCore + 0] - PS1_V1_Scale[binCore - 1]) + PS1_V1_Scale[binCore - 1]; + } + + return (scale * sigma); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { - psF32 *out = modelPSF->params->data.F32; psF32 *in = modelFLT->params->data.F32; @@ -357,5 +405,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -411,5 +459,5 @@ // convert to shape terms (SXX,SYY,SXY) // XXX user-defined value for limit? - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PS1_V1.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PS1_V1.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_PS1_V1.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_PS1_V1(const psVector *params); psF64 pmModelRadius_PS1_V1(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_PS1_V1(const psVector *params, psF64 flux); bool pmModelFromPSF_PS1_V1(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_PS1_V1(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_QGAUSS.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_QGAUSS.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_QGAUSS.c (revision 36884) @@ -35,7 +35,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" @@ -57,4 +57,5 @@ # define PM_MODEL_LIMITS pmModelLimits_QGAUSS # define PM_MODEL_RADIUS pmModelRadius_QGAUSS +# define PM_MODEL_SET_FWHM pmModelSetFWHM_QGAUSS # define PM_MODEL_FROM_PSF pmModelFromPSF_QGAUSS # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_QGAUSS @@ -337,4 +338,52 @@ } +// I used the script in models/fwhm.sh to generate the trend of FWHM scaling vs the K value +// FWHM = Scale * Sigma (not that PAR[PM_PAR_SXX] = sigma * sqrt(2) +// K : z_hm : FWHM +// 0 : 1.000 : 2.83 +// 1 : 0.648 : 2.28 +// 2 : 0.430 : 1.85 +// 3 : 0.310 : 1.58 +// 4 : 0.244 : 1.40 +// 5 : 0.200 : 1.26 +// 6 : 0.165 : 1.15 +// 7 : 0.149 : 1.09 +// 8 : 0.125 : 1.00 +// 9 : 0.116 : 0.96 +// 10 : 0.101 : 0.90 +// 11 : 0.095 : 0.87 +// 12 : 0.083 : 0.82 +// 13 : 0.082 : 0.81 +// 14 : 0.080 : 0.80 +// 15 : 0.074 : 0.77 +// 16 : 0.064 : 0.71 +// 17 : 0.068 : 0.74 +// 18 : 0.057 : 0.67 +// 19 : 0.058 : 0.68 + +// static float QGAUSS_Core[] = { 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0}; +static float QGAUSS_Scale[] = {2.83, 2.28, 1.85, 1.58, 1.40, 1.26, 1.15, 1.09, 1.00, 0.96, 0.90, 0.87, 0.82, 0.81, 0.80, 0.77, 0.71, 0.74, 0.67, 0.68}; + +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + + psF32 *PAR = params->data.F32; + + float core = PAR[PM_PAR_7]; + + if (!isfinite(core)) return (2.0*M_SQRT2*sigma); + + // QGAUSS_Core is defined as a set of integer steps, so we can simplify: + int binCore = MAX(0, MIN (19, (int)core)); + + float scale = NAN; + if (binCore == 0) { + scale = (core - binCore + 0) * (QGAUSS_Scale[binCore + 1] - QGAUSS_Scale[binCore + 0]) + QGAUSS_Scale[binCore + 0]; + } else { + scale = (core - binCore - 1) * (QGAUSS_Scale[binCore + 0] - QGAUSS_Scale[binCore - 1]) + QGAUSS_Scale[binCore - 1]; + } + + return (scale * sigma); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { @@ -358,5 +407,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -416,5 +465,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_QGAUSS.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_QGAUSS.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_QGAUSS.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_QGAUSS(const psVector *params); psF64 pmModelRadius_QGAUSS(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_QGAUSS(const psVector *params, psF64 flux); bool pmModelFromPSF_QGAUSS(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_QGAUSS(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_RGAUSS.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_RGAUSS.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_RGAUSS.c (revision 36884) @@ -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" @@ -56,4 +56,5 @@ # define PM_MODEL_LIMITS pmModelLimits_RGAUSS # define PM_MODEL_RADIUS pmModelRadius_RGAUSS +# define PM_MODEL_SET_FWHM pmModelSetFWHM_RGAUSS # define PM_MODEL_FROM_PSF pmModelFromPSF_RGAUSS # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_RGAUSS @@ -330,4 +331,8 @@ } +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (NAN); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { @@ -351,5 +356,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -404,5 +409,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_RGAUSS.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_RGAUSS.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_RGAUSS.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_RGAUSS(const psVector *params); psF64 pmModelRadius_RGAUSS(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_RGAUSS(const psVector *params, psF64 flux); bool pmModelFromPSF_RGAUSS(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_RGAUSS(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_SERSIC.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_SERSIC.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_SERSIC.c (revision 36884) @@ -43,7 +43,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" @@ -66,4 +66,5 @@ # define PM_MODEL_LIMITS pmModelLimits_SERSIC # define PM_MODEL_RADIUS pmModelRadius_SERSIC +# define PM_MODEL_SET_FWHM pmModelSetFWHM_SERSIC # define PM_MODEL_FROM_PSF pmModelFromPSF_SERSIC # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_SERSIC @@ -124,5 +125,5 @@ if (radius <= 1.5) { // Nsub ~ 10*index^2 + 1 - psEllipseAxes axes = pmPSF_ModelToAxes(PAR, pmModelClassGetType ("PS_MODEL_SERSIC")); + psEllipseAxes axes = pmPSF_ModelToAxes(PAR, true); // SERSIC model uses Reff int Nsub = 2 * ((int)(6.0*Sindex / axes.minor)) + 1; Nsub = PS_MIN (Nsub, 121); @@ -357,4 +358,8 @@ } +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (NAN); +} + bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf) { @@ -378,5 +383,5 @@ // the 2D PSF model fits polarization terms (E0,E1,E2) // convert to shape terms (SXX,SYY,SXY) - bool useReff = pmModelUseReff (modelPSF->type); + bool useReff = modelPSF->class->useReff; if (!pmPSF_FitToModel (out, 0.1, useReff)) { psTrace("psModules.objects", 5, "Failed to fit object at (r,c) = (%.1f,%.1f)", in[PM_PAR_YPOS], in[PM_PAR_XPOS]); @@ -432,5 +437,5 @@ // convert to shape terms (SXX,SYY,SXY) // XXX user-defined value for limit? - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; if (!pmPSF_FitToModel (PAR, 0.1, useReff)) { psTrace ("psModules.objects", 3, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_SERSIC.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_SERSIC.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_SERSIC.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_SERSIC(const psVector *params); psF64 pmModelRadius_SERSIC(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_SERSIC(const psVector *params, psF64 flux); bool pmModelFromPSF_SERSIC(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_SERSIC(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_TRAIL.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_TRAIL.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_TRAIL.c (revision 36884) @@ -5,4 +5,5 @@ * The meaning of the parameters may thus vary depending on the specifics of the model. * All models which are used as a PSF representations share a few parameters, for which # +#include "pmModelClass.h" * define names are listed in pmModel.h: @@ -33,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" @@ -55,4 +56,5 @@ # define PM_MODEL_LIMITS pmModelLimits_TRAIL # define PM_MODEL_RADIUS pmModelRadius_TRAIL +# define PM_MODEL_SET_FWHM pmModelSetFWHM_TRAIL # define PM_MODEL_FROM_PSF pmModelFromPSF_TRAIL # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_TRAIL @@ -352,5 +354,5 @@ psF32 *psfPAR = source->modelPSF->params->data.F32; - bool useReff = pmModelUseReff (source->modelPSF->type); + bool useReff = source->modelPSF->class->useReff; psEllipseAxes psfAxes; @@ -413,4 +415,8 @@ // PAR_LENGTH is the unconvolved length. add a bit for safety return (0.5*PAR[PM_PAR_LENGTH] + 2); +} + +psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) { + return (NAN); } Index: branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_TRAIL.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_TRAIL.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/models/pmModel_TRAIL.h (revision 36884) @@ -8,4 +8,5 @@ psF64 pmModelFlux_TRAIL(const psVector *params); psF64 pmModelRadius_TRAIL(const psVector *params, psF64 flux); +psF64 pmModelSetFWHM_TRAIL(const psVector *params, psF64 flux); bool pmModelFromPSF_TRAIL(pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf); bool pmModelParamsFromPSF_TRAIL(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmDetEff.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmDetEff.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmDetEff.c (revision 36884) @@ -17,7 +17,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmGrowthCurve.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmGrowthCurve.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmGrowthCurve.c (revision 36884) @@ -30,7 +30,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmGrowthCurveGenerate.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmGrowthCurveGenerate.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmGrowthCurveGenerate.c (revision 36884) @@ -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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmModel.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmModel.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmModel.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmModel.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmModel.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmModel.h (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.h (revision 36884) @@ -35,7 +35,9 @@ char *name; int nParams; + bool useReff; pmModelFunc modelFunc; pmModelFlux modelFlux; pmModelRadius modelRadius; + pmModelSetFWHM modelSetFWHM; pmModelLimits modelLimits; pmModelGuessFunc modelGuess; Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelFuncs.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelFuncs.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelFuncs.h (revision 36884) @@ -110,4 +110,7 @@ typedef psF64 (*pmModelRadius)(const psVector *params, double flux); +// This function returns the FWHM given the supplied sigma (major or minor) +typedef psF64 (*pmModelSetFWHM)(const psVector *params, double sigma); + // This function provides the model guess parameters based on the details of // the given source. Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelUtils.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelUtils.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelUtils.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPCM_MinimizeChisq.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPCM_MinimizeChisq.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPCM_MinimizeChisq.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPCMdata.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPCMdata.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPCMdata.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF.h (revision 36884) @@ -106,9 +106,9 @@ pmPSF *pmPSFBuildSimple (char *typeName, float sxx, float syy, float sxy, ...); -bool pmPSF_AxesToModel (psF32 *modelPar, psEllipseAxes axes, pmModelType type); +bool pmPSF_AxesToModel (psF32 *modelPar, psEllipseAxes axes, bool useReff); bool pmPSF_FitToModel (psF32 *fittedPar, float minMinorAxis, bool useReff); psEllipsePol pmPSF_ModelToFit (psF32 *modelPar, bool useReff); -psEllipseAxes pmPSF_ModelToAxes (psF32 *modelPar, pmModelType type); +psEllipseAxes pmPSF_ModelToAxes (psF32 *modelPar, bool useReff); /// Calculate FWHM value from a PSF Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF_IO.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF_IO.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF_IO.c (revision 36884) @@ -47,7 +47,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtry.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtry.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtry.c (revision 36884) @@ -29,7 +29,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryFitEXT.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryFitEXT.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryFitEXT.c (revision 36884) @@ -29,7 +29,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryFitPSF.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryFitPSF.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryFitPSF.c (revision 36884) @@ -27,7 +27,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMakePSF.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMakePSF.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMakePSF.c (revision 36884) @@ -28,7 +28,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" @@ -212,5 +212,5 @@ assert (source->modelEXT); // all unmasked sources should have modelEXT - bool useReff = pmModelUseReff (source->modelEXT->type); + bool useReff = source->modelEXT->class->useReff; psEllipsePol pol = pmPSF_ModelToFit (source->modelEXT->params->data.F32, useReff); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMetric.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMetric.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryMetric.c (revision 36884) @@ -28,7 +28,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryModel.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryModel.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSFtryModel.c (revision 36884) @@ -29,7 +29,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmPhotObj.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmPhotObj.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmPhotObj.c (revision 36884) @@ -29,7 +29,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.c (revision 36884) @@ -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" @@ -146,4 +146,5 @@ source->apMagRaw = NAN; source->apRadius = NAN; + source->apNpixels = 0; source->apFlux = NAN; source->apFluxErr = NAN; @@ -237,4 +238,5 @@ source->apMagRaw = in->apMagRaw; source->apRadius = in->apRadius; + source->apNpixels = in->apNpixels; source->apFlux = in->apFlux; source->apFluxErr = in->apFluxErr; @@ -987,5 +989,5 @@ if (!isfinite(oldI0)) return false; - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; pmModelParamsToAxes (&axes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], useReff); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.h (revision 36884) @@ -97,4 +97,5 @@ float apMagRaw; ///< raw mag in given aperture float apRadius; ///< radius for aperture magnitude + int apNpixels; ///< number of unmasked pixels in aperture float apFlux; ///< apFlux corresponding to psfMag or extMag (depending on type) float apFluxErr; ///< apFluxErr corresponding to psfMag or extMag (depending on type) Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceContour.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceContour.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceContour.c (revision 36884) @@ -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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitModel.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitModel.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitModel.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitPCM.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitPCM.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitPCM.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitSet.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitSet.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceFitSet.c (revision 36884) @@ -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: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceGroups.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceGroups.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceGroups.c (revision 36884) @@ -18,7 +18,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO.c (revision 36884) @@ -40,7 +40,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CFF.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CFF.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CFF.c (revision 36884) @@ -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" @@ -208,5 +208,5 @@ axes.minor = 1.0; axes.theta = 0.0; - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, model->class->useReff); // peak->detValue, rawFlux, smoothFlux are all set to the flux argument which is counts per second @@ -273,5 +273,5 @@ galaxyAxes.theta = theta * PS_RAD_DEG; - pmPSF_AxesToModel (xPAR, galaxyAxes, galaxyModelType); + pmPSF_AxesToModel (xPAR, galaxyAxes, model->class->useReff); if (model->params->n > 7) { xPAR[PM_PAR_7] = 0.5 / Sindex; @@ -403,5 +403,5 @@ yPos[n_rows] = PAR[PM_PAR_YPOS]; - psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type); + psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff); rMajor[n_rows] = axes.major; rMinor[n_rows] = axes.minor; @@ -461,5 +461,5 @@ yPos[0] = PAR[PM_PAR_YPOS]; - psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type); + psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff); rMajor[0] = axes.major; rMinor[0] = axes.minor; @@ -490,5 +490,5 @@ yPos[1] = PAR[PM_PAR_YPOS]; - psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type); + psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff); rMajor[1] = axes.major; rMinor[1] = axes.minor; Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMF.c.in =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMF.c.in (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMF.c.in (revision 36884) @@ -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" @@ -142,7 +142,8 @@ @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG", PS_DATA_F32, "magnitude in standard aperture", source->apMag); @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RAW", PS_DATA_F32, "magnitude in reported aperture", source->apMagRaw); - @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS", PS_DATA_F32, "radius used for aperture mags", outputs.apRadius); + @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS", PS_DATA_F32, "radius used for aperture mags", source->apRadius); @>PS1_DV1,>PS1_V3,>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_FLUX", PS_DATA_F32, "instrumental flux in standard aperture", source->apFlux); @>PS1_DV1,>PS1_V3,>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_FLUX_SIG", PS_DATA_F32, "aperture flux error", source->apFluxErr); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "AP_NPIX", PS_DATA_S32, "aperture unmasked pixels", source->apNpixels); @extNsigma); + // PSF shape parameters: @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_MAJOR", PS_DATA_F32, "PSF width (major axis)", outputs.psfMajor); @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR", PS_DATA_F32, "PSF width (minor axis)", outputs.psfMinor); @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA", PS_DATA_F32, "PSF orientation angle", outputs.psfTheta); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_CORE", PS_DATA_F32, "k term if defined", outputs.psfCore); + + // I use a look-up table and linear interpolation to map PSF_MAJOR,PSF_MINOR + PSF_CORE to FWHM values + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_FWHM_MAJ", PS_DATA_F32, "PSF FWHM (major axis)", outputs.psfMajorFWHM); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_FWHM_MIN", PS_DATA_F32, "PSF FWHM (minor axis)", outputs.psfMinorFWHM); + + // psf data quality @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF", PS_DATA_F32, "PSF coverage/quality factor (bad)", source->pixWeightNotBad); @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF_PERFECT", PS_DATA_F32, "PSF coverage/quality factor (poor)", source->pixWeightNotPoor); @@ -197,5 +206,5 @@ } - if (source->lensingOBJ && source->lensingPSF->smear) { + if (source->lensingPSF && source->lensingPSF->smear) { @>PS1_V4@ psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SM_PSF", PS_DATA_F32, "smear polarizability element (objects)", source->lensingPSF->smear->X11); @>PS1_V4@ psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SM_PSF", PS_DATA_F32, "smear polarizability element (objects)", source->lensingPSF->smear->X12); @@ -205,5 +214,5 @@ } - if (source->lensingOBJ && source->lensingPSF->shear) { + if (source->lensingPSF && source->lensingPSF->shear) { @>PS1_V4@ psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SH_PSF", PS_DATA_F32, "shear polarizability element (objects)", source->lensingPSF->shear->X11); @>PS1_V4@ psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SH_PSF", PS_DATA_F32, "shear polarizability element (objects)", source->lensingPSF->shear->X12); @@ -302,12 +311,16 @@ // define PSF model type - // XXX need to carry the extra model parameters int modelType = pmModelClassGetType ("PS_MODEL_GAUSS"); - char *PSF_NAME = psMetadataLookupStr (&status, header, "PSF_NAME"); + // if header does not define the model, default to a gaussian + char *PSF_NAME = psMetadataLookupStr (&status, header, "PSFMODEL"); if (PSF_NAME != NULL) { modelType = pmModelClassGetType (PSF_NAME); } assert (modelType > -1); + + // do we expect to find lensing parameters? + bool haveLensOBJ = psMetadataLookupBool (&status, header, "LENS_OBJ"); + bool haveLensPSF = psMetadataLookupBool (&status, header, "LENS_PSF"); // We get the size of the table, and allocate the array of sources first because the table @@ -344,4 +357,8 @@ @ALL@ axes.theta = psMetadataLookupF32 (&status, row, "PSF_THETA"); @ALL@ axes.theta = axes.theta * PS_RAD_DEG; + + @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n >= PM_PAR_7) { + @>PS1_V4,>PS1_SV2,>PS1_DV3@ PAR[PM_PAR_7] = psMetadataLookupF32 (&status, row, "PSF_CORE"); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ } @ALL@ PAR[PM_PAR_SKY] = psMetadataLookupF32 (&status, row, "SKY"); @@ -355,4 +372,6 @@ @ALL@ source->apMag = psMetadataLookupF32 (&status, row, "AP_MAG"); @>PS1_V2,PS1_SV?,>PS1_DV1@ source->apMagRaw = psMetadataLookupF32 (&status, row, "AP_MAG_RAW"); + @>PS1_DV1,>PS1_V3,>PS1_SV1@ source->apFlux = psMetadataLookupF32 (&status, row, "AP_FLUX"); + @>PS1_DV1,>PS1_V3,>PS1_SV1@ source->apFluxErr = psMetadataLookupF32 (&status, row, "AP_FLUX_SIG"); // XXX use these to determine PAR[PM_PAR_I0] if they exist? @@ -365,5 +384,5 @@ @ALL@ dPAR[PM_PAR_I0] = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN; - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, model->class->useReff); @ALL@ float peakMag = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG"); @@ -383,5 +402,6 @@ @ALL@ source->crNsigma = psMetadataLookupF32 (&status, row, "CR_NSIGMA"); @ALL@ source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA"); - @ALL@ source->apRadius = psMetadataLookupS32 (&status, row, "AP_MAG_RADIUS"); + @ALL@ source->apRadius = psMetadataLookupF32 (&status, row, "AP_MAG_RADIUS"); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ source->apNpixels = psMetadataLookupS32 (&status, row, "AP_NPIX"); // note that some older versions used PSF_PROBABILITY: this was not well defined. @@ -410,4 +430,39 @@ @>PS1_V2,PS1_SV?@ source->moments->Mxyyy = -0.25 * psMetadataLookupF32 (&status, row, "MOMENTS_M4S"); @>PS1_V2,PS1_SV?@ source->moments->Myyyy = 0.0; + + // Lensing parameters (on read if PS1_V5+) + if (haveLensOBJ) { + source->lensingOBJ = pmSourceLensingAlloc (); + source->lensingOBJ->smear = pmLensingParsAlloc(); + source->lensingOBJ->shear = pmLensingParsAlloc(); + + @>PS1_V4@ source->lensingOBJ->smear->X11 = psMetadataLookupF32 (&status, row, "LENS_X11_SM_OBJ"); + @>PS1_V4@ source->lensingOBJ->smear->X12 = psMetadataLookupF32 (&status, row, "LENS_X12_SM_OBJ"); + @>PS1_V4@ source->lensingOBJ->smear->X22 = psMetadataLookupF32 (&status, row, "LENS_X22_SM_OBJ"); + @>PS1_V4@ source->lensingOBJ->smear->e1 = psMetadataLookupF32 (&status, row, "LENS_E1_SM_OBJ"); + @>PS1_V4@ source->lensingOBJ->smear->e2 = psMetadataLookupF32 (&status, row, "LENS_E2_SM_OBJ"); + @>PS1_V4@ source->lensingOBJ->shear->X11 = psMetadataLookupF32 (&status, row, "LENS_X11_SH_OBJ"); + @>PS1_V4@ source->lensingOBJ->shear->X12 = psMetadataLookupF32 (&status, row, "LENS_X12_SH_OBJ"); + @>PS1_V4@ source->lensingOBJ->shear->X22 = psMetadataLookupF32 (&status, row, "LENS_X22_SH_OBJ"); + @>PS1_V4@ source->lensingOBJ->shear->e1 = psMetadataLookupF32 (&status, row, "LENS_E1_SH_OBJ"); + @>PS1_V4@ source->lensingOBJ->shear->e2 = psMetadataLookupF32 (&status, row, "LENS_E2_SH_OBJ"); + } + + if (haveLensPSF) { + source->lensingPSF = pmSourceLensingAlloc (); + source->lensingPSF->smear = pmLensingParsAlloc(); + source->lensingPSF->shear = pmLensingParsAlloc(); + + @>PS1_V4@ source->lensingPSF->smear->X11 = psMetadataLookupF32 (&status, row, "LENS_X11_SM_PSF"); + @>PS1_V4@ source->lensingPSF->smear->X12 = psMetadataLookupF32 (&status, row, "LENS_X12_SM_PSF"); + @>PS1_V4@ source->lensingPSF->smear->X22 = psMetadataLookupF32 (&status, row, "LENS_X22_SM_PSF"); + @>PS1_V4@ source->lensingPSF->smear->e1 = psMetadataLookupF32 (&status, row, "LENS_E1_SM_PSF"); + @>PS1_V4@ source->lensingPSF->smear->e2 = psMetadataLookupF32 (&status, row, "LENS_E2_SM_PSF"); + @>PS1_V4@ source->lensingPSF->shear->X11 = psMetadataLookupF32 (&status, row, "LENS_X11_SH_PSF"); + @>PS1_V4@ source->lensingPSF->shear->X12 = psMetadataLookupF32 (&status, row, "LENS_X12_SH_PSF"); + @>PS1_V4@ source->lensingPSF->shear->X22 = psMetadataLookupF32 (&status, row, "LENS_X22_SH_PSF"); + @>PS1_V4@ source->lensingPSF->shear->e1 = psMetadataLookupF32 (&status, row, "LENS_E1_SH_PSF"); + @>PS1_V4@ source->lensingPSF->shear->e2 = psMetadataLookupF32 (&status, row, "LENS_E2_SH_PSF"); + } @>PS1_V2,PS1_SV?,>PS1_DV1@ source->moments->Mrf = psMetadataLookupF32 (&status, row, "MOMENTS_R1"); @@ -982,5 +1037,5 @@ psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_THETA_ERR", 0, "EXT angle err (SXY, isnan)", dPAR[PM_PAR_SXY]); } else { - psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type); + psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff); psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_WIDTH_MAJ", 0, "EXT width (major axis), length for trail", axes.major); psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_WIDTH_MIN", 0, "EXT width (minor axis), sigma for trail", axes.minor); @@ -1132,5 +1187,5 @@ axes.minor = psMetadataLookupF32(&status, row, "EXT_WIDTH_MIN"); axes.theta = psMetadataLookupF32(&status, row, "EXT_THETA"); - if (!pmPSF_AxesToModel(PAR, axes, modelType)) { + if (!pmPSF_AxesToModel(PAR, axes, model->class->useReff)) { // Do we need to fail here or can this happen? psError(PS_ERR_UNKNOWN, false, "Failed to convert psf axes to model"); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMP.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMP.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMP.c (revision 36884) @@ -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" @@ -136,5 +136,5 @@ lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky); - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); float psfMagErr = isfinite(source->psfMagErr) ? source->psfMagErr : 999; @@ -293,5 +293,5 @@ goto skip_source; - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, source->modelPSF->class->useReff); psArrayAdd (sources, 100, source); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_MatchedRefs.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_MatchedRefs.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_MatchedRefs.c (revision 36884) @@ -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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_OBJ.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_OBJ.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_OBJ.c (revision 36884) @@ -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" @@ -93,5 +93,5 @@ } - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); psLineInit (line); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_CAL_0.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_CAL_0.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_CAL_0.c (revision 36884) @@ -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" @@ -115,5 +115,5 @@ yErr = dPAR[PM_PAR_YPOS]; if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX])) { - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); } else { axes.major = NAN; @@ -290,5 +290,5 @@ dPAR[PM_PAR_I0] = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN; - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, model->class->useReff); float peakMag = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG"); @@ -624,5 +624,5 @@ yErr = dPAR[PM_PAR_YPOS]; - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); // generate RA,DEC Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_DEV_0.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_DEV_0.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_DEV_0.c (revision 36884) @@ -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" @@ -91,5 +91,5 @@ yErr = dPAR[PM_PAR_YPOS]; - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); } else { // XXX: This code seg faults if source->peak is NULL. @@ -216,5 +216,5 @@ source->psfMagErr = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG"); - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, model->class->useReff); float peakMag = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG"); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_DEV_1.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_DEV_1.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_PS1_DEV_1.c (revision 36884) @@ -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" @@ -97,5 +97,5 @@ yErr = dPAR[PM_PAR_YPOS]; if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX])) { - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); } else { axes.major = NAN; @@ -259,5 +259,5 @@ dPAR[PM_PAR_I0] = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN; - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, model->class->useReff); float peakMag = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG"); @@ -524,5 +524,5 @@ yErr = dPAR[PM_PAR_YPOS]; - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); row = psMetadataAlloc (); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_RAW.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_RAW.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_RAW.c (revision 36884) @@ -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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_SMPDATA.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_SMPDATA.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_SMPDATA.c (revision 36884) @@ -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" @@ -93,5 +93,5 @@ lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky); - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); } else { @@ -190,5 +190,5 @@ axes.theta = psMetadataLookupF32 (&status, row, "THETA"); - pmPSF_AxesToModel (PAR, axes, modelType); + pmPSF_AxesToModel (PAR, axes, model->class->useReff); source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT; Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_SX.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_SX.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_SX.c (revision 36884) @@ -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" @@ -82,5 +82,5 @@ // pmSourceSextractType (source, &type, &flags); - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); psLineInit (line); Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceMatch.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceMatch.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceMatch.c (revision 36884) @@ -18,7 +18,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceMoments.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceMoments.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceMoments.c (revision 36884) @@ -35,7 +35,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceOutputs.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceOutputs.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceOutputs.c (revision 36884) @@ -26,7 +26,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" @@ -108,17 +108,29 @@ } if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXY]) && isfinite(PAR[PM_PAR_SYY])) { - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); outputs->psfMajor = axes.major; outputs->psfMinor = axes.minor; outputs->psfTheta = axes.theta*PS_DEG_RAD; + + // some models (PS1_V1, QGAUSS) have an extra 'core' parameter + outputs->psfCore = NAN; + if (model->type == pmModelClassGetType ("PS_MODEL_PS1_V1")) { + outputs->psfCore = PAR[PM_PAR_7]; + } + if (model->type == pmModelClassGetType ("PS_MODEL_QGAUSS")) { + outputs->psfCore = PAR[PM_PAR_7]; + } + + outputs->psfMajorFWHM = model->class->modelSetFWHM(model->params, axes.major); + outputs->psfMinorFWHM = model->class->modelSetFWHM(model->params, axes.minor); } else { outputs->psfMajor = NAN; outputs->psfMinor = NAN; outputs->psfTheta = NAN; + outputs->psfCore = NAN; } outputs->chisq = model->chisq; outputs->nDOF = model->nDOF; outputs->nPix = model->nPix; - outputs->apRadius = source->apRadius; } else { bool useMoments = pmSourcePositionUseMoments(source); @@ -138,8 +150,8 @@ outputs->psfMinor = NAN; outputs->psfTheta = NAN; + outputs->psfCore = NAN; outputs->chisq = NAN; outputs->nDOF = 0; outputs->nPix = 0; - outputs->apRadius = NAN; } Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceOutputs.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceOutputs.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceOutputs.h (revision 36884) @@ -26,6 +26,8 @@ float psfMinor; float psfTheta; + float psfCore; + float psfMajorFWHM; + float psfMinorFWHM; float chisq; - float apRadius; int nPix; int nDOF; Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePhotometry.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePhotometry.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePhotometry.c (revision 36884) @@ -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" @@ -330,5 +330,5 @@ // measure fitMag - flux = model->modelFlux (model->params); + flux = model->class->modelFlux (model->params); if (flux > 0) { mag = -2.5*log10(flux); @@ -359,6 +359,5 @@ bool status; - int nPix = 0; - status = pmSourcePhotometryAper(&nPix, &source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal); + status = pmSourcePhotometryAper(&source->apNpixels, &source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal); if (status) { source->mode |= PM_SOURCE_MODE_AP_MAGS; @@ -490,5 +489,5 @@ // for the full model, add all points - value = fabs(model->modelFunc (NULL, params, coord) - sky); + value = fabs(model->class->modelFunc (NULL, params, coord) - sky); modelSum += value; @@ -893,5 +892,5 @@ // for the full model, add all points - float value = model->modelFunc (NULL, params, coord); + float value = model->class->modelFunc (NULL, params, coord); // fprintf (stderr, "%d, %d : %f, %f : %f - %f : %f\n", Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotApResid.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotApResid.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotApResid.c (revision 36884) @@ -35,7 +35,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotMoments.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotMoments.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotMoments.c (revision 36884) @@ -38,7 +38,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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotPSFModel.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotPSFModel.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourcePlotPSFModel.c (revision 36884) @@ -39,7 +39,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" @@ -147,5 +147,5 @@ // force the axis ratio to be < 20.0 psEllipseAxes axes_mnt = psEllipseMomentsToAxes (moments, 20.0); - psEllipseAxes axes_psf = pmPSF_ModelToAxes (PAR, model->type); + psEllipseAxes axes_psf = pmPSF_ModelToAxes (PAR, model->class->useReff); // moments major axis Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceSky.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceSky.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceSky.c (revision 36884) @@ -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" Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceUtils.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceUtils.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceUtils.c (revision 36884) @@ -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; Index: branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceVisual.c =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceVisual.c (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceVisual.c (revision 36884) @@ -16,7 +16,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" Index: branches/eam_branches/ipp-20140610/psModules/src/psmodules.h =================================================================== --- branches/eam_branches/ipp-20140610/psModules/src/psmodules.h (revision 36845) +++ branches/eam_branches/ipp-20140610/psModules/src/psmodules.h (revision 36884) @@ -129,4 +129,5 @@ #include +#include #include #include @@ -149,5 +150,4 @@ #include #include -#include #include #include