Changeset 12220 for branches/dvo-mods-2007-02/Ohana/src/relastro/src/FitPM.c

Timestamp:

Mar 4, 2007, 3:45:18 PM (19 years ago)

Author:

eugene

Message:

finishing up the basic code; almost compiles

File:

• branches/dvo-mods-2007-02/Ohana/src/relastro/src/FitPM.c (modified) (3 diffs)

branches/dvo-mods-2007-02/Ohana/src/relastro/src/FitPM.c

@@ -2 +2 @@
 
 /* do we want an init function which does the alloc and a clear function to free? */
-int FitPM (PMFit *fit, double *X, double *dX, double *Y, double *dY, double *T, int Npts) {
+int FitPM (PMFit *fit, double *X, double *dX, double *Y, double *dY, time_t *T, int Npts) {
+
+  int i;
 
   double **A, **B;
+  double wx, wy, Wx, Wy, Tx, Ty, Tx2, Ty2, Xs, Ys, XT, YT;
 
   /* do I need to do this as 2 2x2 matrix equations? */
-  ALLOCATE (A, double *, 4);
-  ALLOCATE (B, double *, 4);
-  for (i = 0; i < 4; i++) {
-    ALLOCATE (A[i], double, 4);
-    ALLOCATE (B[i], double, 1);
-    bzero (A[i], 4*sizeof(double));
-    bzero (B[i], 1*sizeof(double));
-  }
+  A = array_init (4, 4);
+  B = array_init (4, 1);
 
+  Wx = Wy = Tx = Ty = Tx2 = Ty2 = Xs = Ys = XT = YT = 0.0;
   for (i = 0; i < Npts; i++) {
     /* handle case where dX or dY = 0.0 */
@@ -56 +54 @@
   dgaussj (A, 4, B, 1);
 
-  fit[0].Ro = B[0];
-  fit[0].uR = B[1];
-  fit[0].Do = B[2];
-  fit[0].uD = B[3];
+  fit[0].Ro = B[0][0];
+  fit[0].uR = B[1][0];
+  fit[0].Do = B[2][0];
+  fit[0].uD = B[3][0];
   fit[0].p  = 0.0;
   
@@ -68 +66 @@
   fit[0].dp  = 0.0;
   
-  for (i = 0; i < 4; i++) {
-    free (A[i]);
-    free (B[i]);
-  }
-  free (A);
-  free (B);
+  array_free (A, 4);
+  array_free (B, 4);
 
   return (TRUE);