Changeset 35347

Timestamp:

Apr 2, 2013, 2:32:20 PM (13 years ago)

Author:

eugene

Message:

fix minor issues in fitplx

File:

• branches/eam_branches/ipp-20130307/Ohana/src/opihi/cmd.astro/fitplx.c (modified) (4 diffs)

branches/eam_branches/ipp-20130307/Ohana/src/opihi/cmd.astro/fitplx.c

@@ -95 +95 @@
   Tmean /= Npts;
 
-  fprintf (stderr, "R,D : %f,%f, T: %f, Trange: %f\n", Rmean, Dmean, Tmean, Tmax - Tmin);
+  fprintf (stderr, "R,D : %f,%f, T: %f, Trange: %f, Tmin: %f, Tmax: %f\n", Rmean, Dmean, Tmean, Tmax - Tmin, Tmin, Tmax);
 
   /* project coordinates to a plane centered on the object with units of arcsec */
@@ -109 +109 @@
   strcpy (coords.ctype, "RA---SIN");
 
-  double *X, *Y, *t, *pX, *pY;
+  double *X, *Y, *t, *pX, *pY, *dX, *dY;
   ALLOCATE (X, double, N);
   ALLOCATE (Y, double, N);
+  ALLOCATE (dX, double, N);
+  ALLOCATE (dY, double, N);
   ALLOCATE (t, double, N);
   ALLOCATE (pX, double, N);
@@ -125 +127 @@
     if (mask && !mask[i]) continue;
     RD_to_XY (&X[n], &Y[n], R[i], D[i], &coords);
+    dX[n] = dR[i];
+    dY[n] = dD[i];
     t[n] = (T[i] - Tmean) / 365.25;
     ParFactor (&pX[n], &pY[n], R[i], D[i], T[i]);
@@ -140 +144 @@
 
   PlxFit fit;
-  FitPMandPar (&fit, X, dR, Y, dD, t, pX, pY, n, VERBOSE);
+  FitPMandPar (&fit, X, dX, Y, dY, t, pX, pY, n, VERBOSE);
 
   fprintf (stderr, "Roff, Doff: %f, %f; dRo, dDo: %f, %f\n", fit.Ro, fit.Do, fit.dRo, fit.dDo);
-  fprintf (stderr, "Ro, Do: %f, %f\n", fit.Ro + Rmean, fit.Do + Dmean);
+  
+  XY_to_RD (&Rmean, &Dmean, fit.Ro, fit.Do, &coords);
+  fprintf (stderr, "Ro, Do: %f, %f\n", Rmean, Dmean);
 
   fprintf (stderr, "uR, uD: %f, %f; duR, duD: %f, %f\n", fit.uR, fit.uD, fit.duR, fit.duD);