Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/lib.data/mrqmin.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/lib.data/mrqmin.c (modified) (3 diffs)

branches/simtest_nebulous_branches/Ohana/src/opihi/lib.data/mrqmin.c

@@ -17 +17 @@
 
   int k, j, i;
-  opihi_flt ydiff, wt, chisq;
+  opihi_flt ymodel, ydiff, wt, chisq;
 
   for (j = 0; j < Npar; j++) {
@@ -27 +27 @@
   for (i = 0; i < Npts; i++) {
 
-    ydiff = funcs (x[i], par, Npar, dyda) - y[i];
+    ymodel = funcs (x[i], par, Npar, dyda);
+    ydiff = ymodel - y[i];
     chisq += SQ(ydiff) * dy[i];
+
+    // fprintf (stderr, "%f %f - %f : %f -> %f\n", x[i], y[i], ymodel, dy[i], chisq);
 
     for (j = 0; j < Npar; j++) {
@@ -85 +88 @@
 
   /* if good, save temp values */
-  if (rho > 0) {
+  if ((chisq > 1e-3) && (rho > -1e-6)) {
     lambda *= 0.1;
     ochisq = chisq;