Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/fit2d.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/cmd.data/fit2d.c (modified) (8 diffs)

trunk/Ohana/src/opihi/cmd.data/fit2d.c

@@ -7 +7 @@
   int k, K, i, j, n, Npt, Nmask, nx, ny, nterm, mterm, wterm, order;
   int N, Weight, Quiet, ClipNiter, VERBOSE;
-  float *x, *y, *z, *dz, *zfit, *zf; 
+  opihi_flt *x, *y, *z, *dz, *zfit, *zf; 
   char name[64], *mask;
   Vector *xvec, *yvec, *zvec, *dzvec;
@@ -64 +64 @@
     return (FALSE);
   }
-  if (Weight && xvec[0].Nelements != dzvec[0].Nelements) {
-    gprint (GP_ERR, "vectors must have same length\n");
-    return (FALSE);
+  REQUIRE_VECTOR_FLT (xvec, FALSE); 
+  REQUIRE_VECTOR_FLT (yvec, FALSE); 
+  REQUIRE_VECTOR_FLT (zvec, FALSE); 
+
+  if (Weight) {
+    REQUIRE_VECTOR_FLT (dzvec, FALSE); 
+    if (xvec[0].Nelements != dzvec[0].Nelements) {
+      gprint (GP_ERR, "vectors must have same length\n");
+      return (FALSE);
+    }
   }
   
@@ -74 +81 @@
   mterm = 2*order + 1;
 
-  ALLOCATE (zfit, float, xvec[0].Nelements);
+  ALLOCATE (zfit, opihi_flt, xvec[0].Nelements);
   ALLOCATE (mask, char, xvec[0].Nelements);
   memset (mask, 0, xvec[0].Nelements);
@@ -102 +109 @@
     }
 
-    x = xvec[0].elements;
-    y = yvec[0].elements;
-    z = zvec[0].elements;
-    if (Weight) dz = dzvec[0].elements;
+    x = xvec[0].elements.Flt;
+    y = yvec[0].elements.Flt;
+    z = zvec[0].elements.Flt;
+    if (Weight) dz = dzvec[0].elements.Flt;
 
     /* add up the x,y values */
@@ -128 +135 @@
 
     /* add up the z values */
-    x = xvec[0].elements;
-    y = yvec[0].elements;
-    z = zvec[0].elements;
+    x = xvec[0].elements.Flt;
+    y = yvec[0].elements.Flt;
+    z = zvec[0].elements.Flt;
     for (i = 0; i < xvec[0].Nelements; i++, x++, y++, z++) {
       if (mask[i]) continue;
@@ -179 +186 @@
     */
     /* generate fitted values */
-    x = xvec[0].elements;
-    y = yvec[0].elements;
+    x = xvec[0].elements.Flt;
+    y = yvec[0].elements.Flt;
     zf = zfit;
     for (n = 0; n < xvec[0].Nelements; n++, x++, y++, zf++) {
@@ -197 +204 @@
 
     /* measure fit residual scatter */
-    x  = xvec[0].elements;
-    y  = yvec[0].elements;
-    z  = zvec[0].elements;
+    x  = xvec[0].elements.Flt;
+    y  = yvec[0].elements.Flt;
+    z  = zvec[0].elements.Flt;
     zf = zfit;
     dZ = dZ2 = 0;
@@ -216 +223 @@
 
     /* mask outlier points */
-    x  = xvec[0].elements;
-    y  = yvec[0].elements;
-    z  = zvec[0].elements;
+    x  = xvec[0].elements.Flt;
+    y  = yvec[0].elements.Flt;
+    z  = zvec[0].elements.Flt;
     zf = zfit;
     Nmask = 0;