Changeset 36859 for trunk/psModules/src/objects/pmPCMdata.c

Timestamp:

Jun 13, 2014, 8:35:36 AM (12 years ago)

Author:

eugene

Message:

remove pmModel class functions from pmModel and replace with a pointer to the class; call model->class->function instead of model->function

File:

• trunk/psModules/src/objects/pmPCMdata.c (modified) (6 diffs)

trunk/psModules/src/objects/pmPCMdata.c

@@ -31 +31 @@
 #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 +293 @@
     
     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 +302 @@
     // 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 +330 @@
     
     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 +339 @@
     // 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 +393 @@
     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);