Changeset 14655 for trunk/psphot/src/psphotModelTest.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/psphotModelTest.c (modified) (3 diffs)

trunk/psphot/src/psphotModelTest.c

@@ -89 +89 @@
             modelName = item->data.V;
         }
-        modelType = pmModelSetType (modelName);
+        modelType = pmModelClassGetType (modelName);
         if (modelType < 0) psAbort("unknown model %s", modelName);
         source->type = PM_SOURCE_TYPE_EXTENDED;
@@ -118 +118 @@
             modelName = item->data.V;
         }
-        modelType = pmModelSetType (modelName);
+        modelType = pmModelClassGetType (modelName);
         if (modelType < 0) psAbort("unknown model %s", modelName);
         source->type = PM_SOURCE_TYPE_EXTENDED;
@@ -148 +148 @@
 
     // if any parameters are defined by the user, take those values
-    int nParams = pmModelParameterCount (modelType);
+    int nParams = pmModelClassParameterCount (modelType);
     psF32 *params = model->params->data.F32;
     params[PM_PAR_XPOS] = xObj; // XXX use the user-supplied value,