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

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

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

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

@@ -9 +9 @@
 # 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, 
-              float *par, int Npar, float **ta, float **tb, 
-              float (funcs)(float, float, float *, int, float *)) {
+static opihi_flt **alpha, **talpha;
+static opihi_flt **beta, **tbeta;
+static opihi_flt *partry, *dyda;
+static opihi_flt ochisq, lambda;
+
+static opihi_flt *parmin = NULL;
+static opihi_flt *parmax = NULL;
+
+opihi_flt mrq2dcof (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+              opihi_flt *par, int Npar, opihi_flt **ta, opihi_flt **tb, 
+              opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *)) {
 
   int k, j, i;
-  float ydiff, wt, chisq;
+  opihi_flt ydiff, wt, chisq;
 
   for (j = 0; j < Npar; j++) {
@@ -60 +60 @@
 }
 
-float mrq2dchi (float *x, float *t, float *y, float *dy, int Npts, 
-                float *par, int Npar, 
-                float (funcs)(float, float, float *, int, float *)) {
-
-  int i;
-  float ydiff, chisq;
+opihi_flt mrq2dchi (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+                opihi_flt *par, int Npar, 
+                opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *)) {
+
+  int i;
+  opihi_flt ydiff, chisq;
 
   chisq = 0.0;
@@ -75 +75 @@
 }
 
-float mrq2dmin (float *x, float *t, float *y, float *dy, int Npts, 
-              float *par, int Npar, 
-              float (funcs)(float, float, float *, int, float *), int VERBOSE) {
+opihi_flt mrq2dmin (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+              opihi_flt *par, int Npar, 
+              opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *), int VERBOSE) {
 
   int j, k;
-  float chisq;
+  opihi_flt chisq;
 
   /* set up test matrixes for this run */
@@ -90 +90 @@
 
   /* keep this test in here? */
-  if (!fgaussjordan (talpha, tbeta, Npar, 1)) {
+  if (!dgaussjordan (talpha, tbeta, Npar, 1)) {
     lambda *= 10.0;
     return (ochisq);
@@ -131 +131 @@
 }
 
-int mrq2dlimits (float *pmin, float *pmax, int Npar) {
-
-  int i;
-
-  ALLOCATE (parmin, float, Npar);
-  ALLOCATE (parmax, float, Npar);
+int mrq2dlimits (opihi_flt *pmin, opihi_flt *pmax, int Npar) {
+
+  int i;
+
+  ALLOCATE (parmin, opihi_flt, Npar);
+  ALLOCATE (parmax, opihi_flt, Npar);
   for (i = 0; i < Npar; i++) {
     parmin[i] = pmin[i];
@@ -144 +144 @@
 }
 
-float mrq2dinit (float *x, float *t, float *y, float *dy, int Npts, 
-              float *par, int Npar, 
-              float (funcs)(float, float, float *, int, float *), int VERBOSE) {
-
-  int i;
-
-  ALLOCATE (dyda, float, Npar);
-  ALLOCATE (partry, float, Npar);
-  ALLOCATE (alpha, float *, Npar);
-  ALLOCATE (beta, float *, Npar);
-  ALLOCATE (talpha, float *, Npar);
-  ALLOCATE (tbeta, float *, Npar);
+opihi_flt mrq2dinit (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+              opihi_flt *par, int Npar, 
+              opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *), int VERBOSE) {
+
+  int i;
+
+  ALLOCATE (dyda, opihi_flt, Npar);
+  ALLOCATE (partry, opihi_flt, Npar);
+  ALLOCATE (alpha, opihi_flt *, Npar);
+  ALLOCATE (beta, opihi_flt *, Npar);
+  ALLOCATE (talpha, opihi_flt *, Npar);
+  ALLOCATE (tbeta, opihi_flt *, Npar);
   for (i = 0; i < Npar; i++) {
-    ALLOCATE (alpha[i], float, Npar);
-    ALLOCATE (beta[i], float, Npar);
-    ALLOCATE (talpha[i], float, Npar);
-    ALLOCATE (tbeta[i], float, Npar);
+    ALLOCATE (alpha[i], opihi_flt, Npar);
+    ALLOCATE (beta[i], opihi_flt, Npar);
+    ALLOCATE (talpha[i], opihi_flt, Npar);
+    ALLOCATE (tbeta[i], opihi_flt, Npar);
   }
 
@@ -181 +181 @@
 
 /* don't invoke this in the middle of a run, only near the end */ 
-float **mrq2dcovar (int Npar) {
-
-  fgaussjordan (alpha, beta, Npar, 1);
+opihi_flt **mrq2dcovar (int Npar) {
+
+  dgaussjordan (alpha, beta, Npar, 1);
   return (alpha);