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

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

@@ -71 +71 @@
     catalog.filename = skylist[0].filename[k];
     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 | LOAD_SECF;
@@ -86 +86 @@
       if (catalog.average[i].Nm != 3) continue;
       m = catalog.average[i].offset;
-      M0 = (Ns == -1) ? catalog.average[i].M_PS : catalog.secfilt[i*Nsec+Ns].M_PS;
+      M0 = (Ns == -1) ? catalog.average[i].M : catalog.secfilt[i*Nsec+Ns].M_PS;
       M1 = PhotCat (&catalog.measure[m+0]);
       M2 = PhotCat (&catalog.measure[m+1]);
@@ -98 +98 @@
       Yvec.elements[N] = (dmt1 + dmt2) / 2.0;
       if (SaveVectors) {
-        Rvec.elements[N] = catalog.average[i].R_PS;
-        Dvec.elements[N] = catalog.average[i].D_PS;
+        Rvec.elements[N] = catalog.average[i].R;
+        Dvec.elements[N] = catalog.average[i].D;
         Zvec.elements[N] = M0;
       }