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

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

@@ -8 +8 @@
   int N, Weight, Quiet, ClipNiter;
   Vector *xvec, *yvec, *dyvec;
-  float *x, *y, *dy, *yf, *yfit;
+  opihi_flt *x, *y, *dy, *yf, *yfit;
   char name[64], *mask;
 
@@ -53 +53 @@
     return (FALSE);
   }
-  if (Weight && xvec[0].Nelements != dyvec[0].Nelements) {
-    gprint (GP_ERR, "vectors must have same length\n");
-    return (FALSE);
-  }
-  
+  REQUIRE_VECTOR_FLT (xvec, FALSE); 
+  REQUIRE_VECTOR_FLT (yvec, FALSE); 
+
+  if (Weight) {
+    REQUIRE_VECTOR_FLT (dyvec, FALSE); 
+    if (xvec[0].Nelements != dyvec[0].Nelements) {
+      gprint (GP_ERR, "vectors must have same length\n");
+      return (FALSE);
+    }
+  }
+ 
+
   /* nterm is number of polynomial terms, starting at x^0 */
   order = atof (argv[3]);
@@ -63 +70 @@
   mterm = 2*nterm;
 
-  ALLOCATE (yfit, float, xvec[0].Nelements);
+  ALLOCATE (yfit, opihi_flt, xvec[0].Nelements);
   ALLOCATE (mask, char, xvec[0].Nelements);
   memset (mask, 0, xvec[0].Nelements);
@@ -88 +95 @@
 
     /* perform linear fit */
-    x = xvec[0].elements;
-    y = yvec[0].elements;
-    if (Weight) dy = dyvec[0].elements;
+    x = xvec[0].elements.Flt;
+    y = yvec[0].elements.Flt;
+    if (Weight) dy = dyvec[0].elements.Flt;
 
     for (i = 0; i < xvec[0].Nelements; i++, x++, y++) {
@@ -121 +128 @@
 
     /* generate fitted values */
-    x = xvec[0].elements;
+    x = xvec[0].elements.Flt;
     yf = yfit;
     for (i = 0; i < xvec[0].Nelements; i++, x++, yf++) {
@@ -134 +141 @@
 
     /* measure fit residual scatter */
-    x  = xvec[0].elements;
-    y  = yvec[0].elements;
+    x  = xvec[0].elements.Flt;
+    y  = yvec[0].elements.Flt;
     yf = yfit;
     dY = dY2 = 0;
@@ -150 +157 @@
 
     /* mask outlier points */
-    x  = xvec[0].elements;
-    y  = yvec[0].elements;
+    x  = xvec[0].elements.Flt;
+    y  = yvec[0].elements.Flt;
     yf = yfit;
     Nmask = 0;
@@ -193 +200 @@
     if ((fvec = SelectVector ("yfit", ANYVECTOR, TRUE)) == NULL) return (FALSE);    
     if ((mvec = SelectVector ("mask", ANYVECTOR, TRUE)) == NULL) return (FALSE);    
-    free (fvec[0].elements);
-    fvec[0].elements = yfit;
+    free (fvec[0].elements.Flt);
+    fvec[0].elements.Flt = yfit;
     fvec[0].Nelements = xvec[0].Nelements;
     mvec[0].Nelements = xvec[0].Nelements;
 
-    REALLOCATE (mvec[0].elements, float, xvec[0].Nelements);
+    REALLOCATE (mvec[0].elements.Flt, opihi_flt, xvec[0].Nelements);
     for (i = 0; i < xvec[0].Nelements; i++) {
-      mvec[0].elements[i] = mask[i];
+      mvec[0].elements.Flt[i] = mask[i];
     }
   } else {