Changeset 33415 for branches/meh_branches/ppstack_test/Ohana/src/relastro/src/UpdateObjects.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/relastro/src/UpdateObjects.c (modified) (5 diffs)

branches/meh_branches/ppstack_test/Ohana/src/relastro/src/UpdateObjects.c

@@ -84 +84 @@
       /* calculate the average value of R,D for a single star */
 
+      XVERB = FALSE;
+
       // skip objects which are known to be problematic
       // XXX include this code or not?
@@ -196 +198 @@
       }
       
-      XVERB = FALSE && (catalog[i].measure[m].dM < 0.01) && (N == 6) && (mode == FIT_PM_ONLY);
+      // XVERB |= (catalog[i].averge[j].objID == 0xc90) && (catalog[i].average[j].catID == 0x2a1e);
+      XVERB |= (catalog[i].average[j].objID == OBJ_ID_SRC) && (catalog[i].average[j].catID == CAT_ID_SRC);
+      XVERB |= (catalog[i].average[j].objID == OBJ_ID_DST) && (catalog[i].average[j].catID == CAT_ID_DST);
+      // XVERB = (catalog[i].measure[m].dM < 0.01) && (N == 6) && (mode == FIT_PM_ONLY);
 
       // to judge the quality of the PM and PAR fits, we need to fit all three models and compare Chisq
@@ -211 +216 @@
         }         
 
-        FitPM (&fitPM, X, dX, Y, dY, T, N);
-
-        if (XVERB) fprintf (stderr, "fitted:  %f - %f : %f %f : %f %f : %f vs %f\n", Tmin, Tmax, fitPM.Ro, fitPM.Do, fitPM.uR, fitPM.uD, fitPM.chisq, fitAve.chisq);
+        FitPM (&fitPM, X, dX, Y, dY, T, N, XVERB);
+
+        if (XVERB) fprintf (stderr, "fitted PM:  %f - %f : %f %f : %f %f : %f vs %f\n", Tmin, Tmax, fitPM.Ro, fitPM.Do, fitPM.uR, fitPM.uD, fitPM.chisq, fitAve.chisq);
 
         // project Ro, Do back to RA,DEC
@@ -225 +230 @@
 
       if (mode == FIT_PM_AND_PAR) {
-        fprintf (stderr, "parallax fitting is still untested (%s, %d)", __FILE__, __LINE__);
-        exit (2);
+        // fprintf (stderr, "parallax fitting is still untested (%s, %d)\n", __FILE__, __LINE__);
 
         for (k = 0; k < N; k++) {
           ParFactor (&pX[k], &pY[k], R[k], D[k], T[k], Tmean);
         }
-        FitPMandPar (&fitPAR, X, dX, Y, dY, T, pX, pY, N);
+        FitPMandPar (&fitPAR, X, dX, Y, dY, T, pX, pY, N, XVERB);
         XY_to_RD (&fitPAR.Ro, &fitPAR.Do, fitPAR.Ro, fitPAR.Do, &coords);
         catalog[i].average[j].flags |= ID_STAR_FIT_PAR;
@@ -276 +280 @@
         break;
       }
-      if (XVERB) fprintf (stderr, "A%f %f -> %f %f (%f,%f) pm=(%f %f)\n",
+      if (XVERB) fprintf (stderr, "%f %f -> %f %f (%f,%f) pm=(%f %f)\n",
                           catalog[i].average[j].R, 
                           catalog[i].average[j].D,