Changeset 27559 for branches/eam_branches/relastro.20100326/src/UpdateObjects.c

Timestamp:

Apr 1, 2010, 2:19:05 PM (16 years ago)

Author:

eugene

Message:

improvements to astrometry model analysis, enable single catalog mode (by coordinate)

Location:

branches/eam_branches/relastro.20100326

Files:

• . (modified) (1 prop)
• src/UpdateObjects.c (modified) (7 diffs)

branches/eam_branches/relastro.20100326/src/UpdateObjects.c

@@ -41 +41 @@
 
   off_t j, k, m;
-  int i, N, Nsecfilt, mode, status;
+  int i, N, Nsecfilt, mode, status, XVERB;
   StatType statsR, statsD;
   Coords coords;
@@ -63 +63 @@
   strcpy (coords.ctype, "RA---SIN");
 
+  XVERB = FALSE;
+
   // use J2000 as a reference time
   T2000 = ohana_date_to_sec ("2000/01/01");
@@ -158 +160 @@
       Tmean /= (float) N;
       
+      XVERB = (catalog[i].measure[m].dM < 0.02) && (mode == FIT_PM_ONLY);
       /* project all of the R,D coordinates to a plane centered on this coordinate
          set the times to be relative to Tmean */
@@ -164 +167 @@
         dX[k] =  dR[k];
         dY[k] =  dD[k];
+        if (XVERB) fprintf (stderr, "%lld %f %f %f  %f %f\n", (long long) k, T[k], R[k], D[k], X[k], Y[k]);
         T[k] -= Tmean;
-        // fprintf (stderr, "%d %f %f %f  %f %f\n", k, T[k], R[k], D[k], X[k], Y[k]);
       }   
 
@@ -193 +196 @@
       if ((mode == FIT_PM_ONLY) || (mode == FIT_PM_AND_PAR)) {
           FitPM (&fitPM, X, dX, Y, dY, T, N);
-          // fprintf (stderr, "fitted:  %f - %f : %f %f : %f %f : %f\n", Tmin, Tmax, fitPM.Ro, fitPM.Do, fitPM.uR, fitPM.uD, fitPM.p);
+          if (XVERB) fprintf (stderr, "fitted:  %f - %f : %f %f : %f %f : %f\n", Tmin, Tmax, fit.Ro, fit.Do, fit.uR, fit.uD, fit.p);
+
           // project Ro, Do back to RA,DEC
           XY_to_RD (&fitPM.Ro, &fitPM.Do, fitPM.Ro, fitPM.Do, &coords);
-          // fprintf (stderr, "project: %f %f : %f %f : %f\n", fitPM.Ro, fitPM.Do, fitPM.uR, fitPM.uD, fitPM.p);
-          // continue;
+          if (XVERB) fprintf (stderr, "project: %f %f : %f %f : %f\n", fit.Ro, fit.Do, fit.uR, fit.uD, fit.p);
 
           fitPM.p  = fitPM.dp  = 0.0;
@@ -224 +227 @@
 # endif
 
-      if (0 && (j < 100)) {
-        fprintf (stderr, "%f %f -> %f %f (%f,%f)\n",
-                 catalog[i].average[j].R, 
-                 catalog[i].average[j].D, 
-                 fit.Ro, fit.Do, 
-                 3600*(catalog[i].average[j].R - fit.Ro), 
-                 3600*(catalog[i].average[j].D - fit.Do));
-      }
+      if (XVERB) fprintf (stderr, "%f %f -> %f %f (%f,%f)\n",
+                          catalog[i].average[j].R, 
+                          catalog[i].average[j].D, 
+                          fit.Ro, fit.Do, 
+                          3600*(catalog[i].average[j].R - fit.Ro), 
+                            3600*(catalog[i].average[j].D - fit.Do));
 
       //make sure that the fit succeeded
@@ -289 +290 @@
       // catalog[i].average[j].Xp  = (fit.Nfit > 1) ? 100.0*log10(fit.chisq) : NAN_S_SHORT;
       catalog[i].average[j].chiSqAve  = fitAve.ChiSq;
-      catalog[i].average[j].chiSqPM  = fitPM.ChiSq;
+      catalog[i].average[j].chiSqPM   = fitPM.ChiSq;
       catalog[i].average[j].chiSqPar  = fitPar.ChiSq;
       catalog[i].average[j].Tmean = Tmean;
+      catalog[i].average[j].Npos = fit.Nfit;
     }