Changeset 2938 for trunk/Ohana/src/opihi/lib.data/mrq2dmin.c

Timestamp:

Jan 8, 2005, 2:45:18 PM (22 years ago)

Author:

eugene

Message:

minor changes

File:

• trunk/Ohana/src/opihi/lib.data/mrq2dmin.c (modified) (5 diffs)

trunk/Ohana/src/opihi/lib.data/mrq2dmin.c

@@ -7 +7 @@
 */
 
+# define VERY_VERBOSE 0
+
 static float **alpha, **talpha;
 static float **beta, **tbeta;
 static float *partry, *dyda;
 static float ochisq, lambda;
+
+static float *parmin = NULL;
+static float *parmax = NULL;
 
 float mrq2dcof (float *x, float *t, float *y, float *dy, int Npts, 
@@ -41 +46 @@
       ta[k][j] = ta[j][k];
       
+# if (VERY_VERBOSE)
+  for (j = 0; j < Npar; j++) {
+    for (k = 0; k < Npar; k++) {
+      fprintf (stderr, "%9.3e  ", ta[j][k]);
+    }
+    fprintf (stderr, "    :   %9.3e  ", tb[j][0]);
+    fprintf (stderr, "\n");
+  }
+# endif
+
   return (chisq);
 
+}
+
+float mrq2dchi (float *x, float *t, float *y, float *dy, int Npts, 
+                float *par, int Npar, 
+                float (funcs)(float, float, float *, int, float *)) {
+
+  int k, j, i;
+  float ydiff, wt, chisq;
+
+  chisq = 0.0;
+  for (i = 0; i < Npts; i++) {
+    ydiff = funcs (x[i], t[i], par, Npar, dyda) - y[i];
+    chisq += SQ(ydiff) * dy[i];
+  }
+  return (chisq);
 }
 
@@ -65 +95 @@
   }
 
-  for (j = 0; j < Npar; j++) partry[j] = par[j] - tbeta[j][0];
+  for (j = 0; j < Npar; j++) {
+    partry[j] = par[j] - tbeta[j][0];
+    /*
+    if (parmin != NULL) partry[j] = MAX (parmin[j], partry[j]);
+    if (parmax != NULL) partry[j] = MIN (parmax[j], partry[j]);
+    */
+  }
 
   chisq = mrq2dcof (x, t, y, dy, Npts, partry, Npar, talpha, tbeta, funcs);
@@ -93 +129 @@
   return (chisq);
 
+}
+
+int mrq2dlimits (float *pmin, float *pmax, int Npar) {
+
+  int i;
+
+  ALLOCATE (parmin, float, Npar);
+  ALLOCATE (parmax, float, Npar);
+  for (i = 0; i < Npar; i++) {
+    parmin[i] = pmin[i];
+    parmax[i] = pmax[i];
+  }
+  return (TRUE);
 }
 
@@ -156 +205 @@
   free (dyda);
 
-}
+  if (parmin != NULL) free (parmin);
+  if (parmax != NULL) free (parmax);
+
+}