Changeset 6329

Timestamp:

Feb 6, 2006, 12:17:54 PM (20 years ago)

Author:

gusciora

Message:

These changes incorporate the new psMinimizeLMM prototype.

Location:

trunk/psModules

Files:

• src/objects/pmObjects.c (modified) (3 diffs)
• test/config/tst_pmConfig.c (modified) (2 diffs)

trunk/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-06 21:03:25 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 22:17:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1654 +1654 @@
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
 
-    /* XXXX: Must change this:
-        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y,
-                                     yErr, modelFunc);
-    */
+    psMinConstrain *constrain = psMinConstrainAlloc();
+    constrain->paramMask = paramMask;
+    fitStatus = psMinimizeLMChi2(myMin, covar, params, constrain,
+                                 x, y, yErr, modelFunc);
+    psFree(constrain);
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i])
@@ -1823 +1824 @@
 
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
-    /* XXXX: Must change this:
-        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
-    */
+    psMinConstrain *constrain = psMinConstrainAlloc();
+    constrain->paramMask = paramMask;
+    fitStatus = psMinimizeLMChi2(myMin, covar, params, constrain,
+                                 x, y, yErr, modelFunc);
+    psFree(constrain);
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i])

trunk/psModules/test/config/tst_pmConfig.c

@@ -13 +13 @@
  * pmConfigDB()
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-06 21:23:46 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 22:17:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -139 +139 @@
     rc = pmConfigRead(&site, &camera, &recipe, &argc, str, "RecipeName");
     if (rc == false) {
-        printf("TEST ERROR: pmPeakAlloc() returned False\n");
+        printf("TEST ERROR: pmConfigRead() returned False\n");
         testStatus = false;
     } else {