Changeset 14327

Timestamp:

Jul 19, 2007, 2:52:15 PM (19 years ago)

Author:

eugene

Message:

update to use modified psMinLM_GuessABP API

File:

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

trunk/psphot/src/psphotModelWithPSF.c

@@ -44 +44 @@
     psF32 Chisq = 0.0;
     psF32 lambda = 0.001;
+    psF32 dLinear = 0.0;
 
     // calculate initial alpha and beta, set chisq (min->value)
@@ -65 +66 @@
         psTrace("psLib.math", 5, "Last delta is %f.  Min->tol is %f.\n", min->lastDelta, min->tol);
 
+
         // set a new guess for Alpha, Beta, Params
-        if (!psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
+        if (!psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda, &dLinear)) {
             min->iter ++;
             lambda *= 10.0;
             continue;
         }
-
-        // measure linear model prediction
-        psF32 dLinear = psMinLM_dLinear(Beta, beta, lambda);
 
         // dump some useful info if trace is defined
@@ -124 +123 @@
     // construct & return the covariance matrix (if requested)
     if (covar != NULL) {
-        if (!psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
+        if (!psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0, NULL)) {
             psTrace ("psLib.math", 5, "failure to calculate covariance matrix\n");
         }