Changeset 14655 for trunk/psphot/src/psphotPSFConvModel.c

Timestamp:

Aug 23, 2007, 2:40:16 PM (19 years ago)

Author:

eugene

Message:

* updates from branch eam_branch_20070817

• changed pmIsFoo to pmFooTest
• changed pmModelGroup to pmModelClass
• added offsets to pmSourceOp
• changed pmModel.params_NEW to pmModel.params
• use new APIs to define a pmModel from a pmPSF at X,Y (pmModelFromPSFforXY)
• use pmModel member functions instead of _GetFunction functions
• added modelParamsFromPSF for STRAIL and TEST1
• move output psf model from readout->analysis to chip->analysis

File:

• trunk/psphot/src/psphotPSFConvModel.c (modified) (3 diffs)

trunk/psphot/src/psphotPSFConvModel.c

@@ -58 +58 @@
     psVector *dparams = modelConv->dparams;
 
-    // get the model function for this model
-    pmModelFunc modelFunc = pmModelFunc_GetFunction (modelConv->type);
-    if (!modelFunc)
-        psAbort("invalid model function");
-
-    // get the limits function for this model
-    pmModelLimits checkLimits = pmModelLimits_GetFunction (modelConv->type);
-    if (!checkLimits)
-        psAbort("invalid model limits function");
-
     // create the minimization constraints
     psMinConstraint *constraint = psMinConstraintAlloc();
     constraint->paramMask = psVectorAlloc (params->n, PS_TYPE_U8);
-    constraint->checkLimits = checkLimits;
+    constraint->checkLimits = modelConv->modelLimits;
 
     // set parameter mask based on fitting mode
@@ -81 +71 @@
     // force the floating parameters to fall within the contraint ranges
     for (int i = 0; i < params->n; i++) {
-        checkLimits (PS_MINIMIZE_PARAM_MIN, i, params->data.F32, NULL);
-        checkLimits (PS_MINIMIZE_PARAM_MAX, i, params->data.F32, NULL);
+        modelConv->modelLimits (PS_MINIMIZE_PARAM_MIN, i, params->data.F32, NULL);
+        modelConv->modelLimits (PS_MINIMIZE_PARAM_MAX, i, params->data.F32, NULL);
     }
 
@@ -90 +80 @@
     psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
 
-    bool fitStatus = psphotModelWithPSF_LMM (myMin, covar, params, constraint, source, psf, modelFunc);
+    bool fitStatus = psphotModelWithPSF_LMM (myMin, covar, params, constraint, source, psf, modelConv->modelFunc);
     for (int i = 0; i < dparams->n; i++) {
         if (psTraceGetLevel("psphot") >= 4) {