Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmModel.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmModel.c (modified) (5 diffs)

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c
 

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c
 

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmModel.c

@@ -33 +33 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
-#include "pmModelClass.h"
 
 static void modelFree(pmModel *tmp)
 {
     psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__);
+    if (!tmp) return;
+
     psFree(tmp->params);
     psFree(tmp->dparams);
@@ -90 +92 @@
     }
 
-    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__);
@@ -156 +160 @@
     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__);
@@ -176 +180 @@
     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__);
@@ -283 +287 @@
             // 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);
             }
 

@@ -15 +15 @@
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c