Changeset 35340

Timestamp:

Apr 2, 2013, 6:32:09 AM (13 years ago)

Author:

eugene

Message:

working on fitplx

File:

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

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

@@ -37 +37 @@
   }
 
+  int VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+  }
+
   if (argc != 6) {
     gprint (GP_ERR, "USAGE: fitplx (ra) (dR) (dec) (dD) (mjd) [-mask mask]\n");
@@ -74 +80 @@
   double Rmean = 0;
   double Dmean = 0;
+  double Tmin = +1000000;
+  double Tmax = -1000000;
   for (i = 0; i < N; i++) {
     if (mask && !mask[i]) continue;
@@ -79 +87 @@
     Dmean += D[i];
     Tmean += T[i];
+    Tmin = MIN(Tmin, T[i]);
+    Tmax = MAX(Tmax, T[i]);
     Npts += 1.0;
   }
@@ -85 +95 @@
   Tmean /= Npts;
 
-  fprintf (stderr, "R,D : %f,%f, T: %f\n", Rmean, Dmean, Tmean);
+  fprintf (stderr, "R,D : %f,%f, T: %f, Trange: %f\n", Rmean, Dmean, Tmean, Tmax - Tmin);
 
   /* project coordinates to a plane centered on the object with units of arcsec */
@@ -130 +140 @@
 
   PlxFit fit;
-  FitPMandPar (&fit, X, dR, Y, dD, t, pX, pY, n, FALSE);
-
-  fprintf (stderr, "Ro, Do: %f, %f; dRo, dDo: %f, %f\n", fit.Ro, fit.Do, fit.dRo, fit.dDo);
+  FitPMandPar (&fit, X, dR, Y, dD, 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);
 
   fprintf (stderr, "uR, uD: %f, %f; duR, duD: %f, %f\n", fit.uR, fit.uD, fit.duR, fit.duD);
@@ -168 +179 @@
   for (i = 0; i < Npts; i++) {
 
-    fprintf (stderr, "%f %f : %f %f : %f : %f %f\n", X[i], dX[i], Y[i], dY[i], T[i], pR[i], pD[i]);
+    if (VERBOSE) fprintf (stderr, "%f %f : %f %f : %f : %f %f\n", X[i], dX[i], Y[i], dY[i], T[i], pR[i], pD[i]);
 
     /* handle case where dX or dY = 0.0 */