Changeset 6683 for trunk/Ohana/src/opihi/dvo/compare.c

Timestamp:

Mar 26, 2006, 10:46:32 AM (20 years ago)

Author:

eugene

Message:

adding proper motion and parallax to addstar, dropping _PS from RA and DEC in average

File:

• trunk/Ohana/src/opihi/dvo/compare.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/compare.c

@@ -3 +3 @@
 
 void compare (Catalog *catlog1, Catalog *catlog2, 
-         Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius) {
+              Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius) {
 
   int i, j, first_j, Nmatch, NMATCH;
@@ -19 +19 @@
   for (i = j = 0; (i < catlog1[0].Naverage) && (j < catlog2[0].Naverage);) {
     
-    dX = catlog1[0].average[i].R_PS - catlog2[0].average[j].R_PS;
+    dX = catlog1[0].average[i].R - catlog2[0].average[j].R;
 
     if (!(i % 100))
@@ -32 +32 @@
       first_j = j;
       for (j = first_j; (fabs (dX) < radius) && (j < catlog2[0].Naverage); j++) {
-        dX = catlog1[0].average[i].R_PS - catlog2[0].average[j].R_PS;
-        dY = catlog1[0].average[i].D_PS - catlog2[0].average[j].D_PS;
+        dX = catlog1[0].average[i].R - catlog2[0].average[j].R;
+        dY = catlog1[0].average[i].D - catlog2[0].average[j].D;
         dR = hypot (dX, dY);
         if (dR < radius) {
-           rvec[0].elements[Nmatch] = catlog1[0].average[i].R_PS;
-           dvec[0].elements[Nmatch] = catlog1[0].average[i].D_PS;
-           mvec[0].elements[Nmatch] = catlog1[0].average[i].M_PS;
+          rvec[0].elements[Nmatch] = catlog1[0].average[i].R;
+          dvec[0].elements[Nmatch] = catlog1[0].average[i].D;
+          mvec[0].elements[Nmatch] = catlog1[0].average[i].M;
           drvec[0].elements[Nmatch] = dX;
           ddvec[0].elements[Nmatch] = dY;
-          dmvec[0].elements[Nmatch] = catlog1[0].average[i].M_PS - catlog2[0].average[j].M_PS;
+          dmvec[0].elements[Nmatch] = catlog1[0].average[i].M - catlog2[0].average[j].M;
           Nmatch ++;
           if (Nmatch == NMATCH - 1) {
@@ -66 +66 @@
   REALLOCATE (dmvec[0].elements, float, Nmatch);
   
-   rvec[0].Nelements = Nmatch;
-   dvec[0].Nelements = Nmatch;
-   mvec[0].Nelements = Nmatch;
+  rvec[0].Nelements = Nmatch;
+  dvec[0].Nelements = Nmatch;
+  mvec[0].Nelements = Nmatch;
   drvec[0].Nelements = Nmatch;
   ddvec[0].Nelements = Nmatch;