Changeset 14655 for trunk/psphot/src/psphotModelGroupInit.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/psphotModelGroupInit.c (modified) (1 diff)

trunk/psphot/src/psphotModelGroupInit.c

@@ -7 +7 @@
 # include "models/pmModel_STRAIL.c"
 
-static pmModelGroup userModels[] = {
-    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelFitStatus_TEST1},
-    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelFitStatus_STRAIL},
+static pmModelClass userModels[] = {
+    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelParamsFromPSF_TEST1, pmModelFitStatus_TEST1},
+    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelParamsFromPSF_STRAIL, pmModelFitStatus_STRAIL},
 };
 
-void psphotModelGroupInit (void) 
+void psphotModelClassInit (void) 
 { 
 
-    // if pmModelGroupInit returns false, we have already init'ed
-    if (!pmModelGroupInit ()) return;
+    // if pmModelClassInit returns false, we have already init'ed
+    if (!pmModelClassInit ()) return;
 
-    int Nmodels = sizeof (userModels) / sizeof (pmModelGroup);
+    int Nmodels = sizeof (userModels) / sizeof (pmModelClass);
     for (int i = 0; i < Nmodels; i++) {
-        pmModelGroupAdd (&userModels[i]);
+        pmModelClassAdd (&userModels[i]);
     }
     return;