Changeset 6683 for trunk/Ohana/src/opihi/dvo/pmeasure.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/pmeasure.c (modified) (3 diffs)

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

@@ -83 +83 @@
     catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
-    case 2:
-      unlock_catalog (&catalog);
-    case 0:
-      continue;
+      case 2:
+        unlock_catalog (&catalog);
+      case 0:
+        continue;
     }
     catalog.catflags = LOAD_AVES | LOAD_MEAS;
@@ -107 +107 @@
     for (N = i = 0; i < catalog.Naverage; i++) {
       if (IDclip && (catalog.average[i].code != IDchoice)) continue;
-      while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
-      while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
+      while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
+      while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
       m = catalog.average[i].offset;
       for (k = 0; k < catalog.average[i].Nm; k++) {
@@ -120 +120 @@
         if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
         if (Zvec.elements[N] < 0.011) continue;
-        fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS - catalog.measure[m+k].dR_PS/3600.0, catalog.average[i].D_PS - catalog.measure[m+k].dD_PS/3600.0, &graphmode.coords);
+        fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R - catalog.measure[m+k].dR_PS/3600.0, catalog.average[i].D - catalog.measure[m+k].dD_PS/3600.0, &graphmode.coords);
         N ++;
       }