Changeset 6683 for trunk/Ohana/src/opihi

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

Location:

trunk/Ohana/src/opihi

Files:

• Makefile.Common (modified) (1 diff)
• dvo/calextract.c (modified) (3 diffs)
• dvo/calmextract.c (modified) (3 diffs)
• dvo/compare.c (modified) (4 diffs)
• dvo/dmt.c (modified) (3 diffs)
• dvo/dvomisc.c (modified) (3 diffs)
• dvo/gstar.c (modified) (3 diffs)
• dvo/imdata.c (modified) (2 diffs)
• dvo/lcurve.c (modified) (2 diffs)
• dvo/lightcurve.c (modified) (2 diffs)
• dvo/mextract.c (modified) (1 diff)
• dvo/photometry.c (modified) (8 diffs)
• dvo/pmeasure.c (modified) (3 diffs)
• dvo/subpix.c (modified) (2 diffs)
• include/dvo1.h (modified) (1 diff)

trunk/Ohana/src/opihi/Makefile.Common

@@ -27 +27 @@
         @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
         @echo ""
+        @echo "current: $^"
+        @echo "current: $*"
+        @echo "current: $@"
         rm -f $@
         cp $^ $@

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

@@ -63 +63 @@
     catalog.filename = skylist[0].filename[Nr];
     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;
@@ -99 +99 @@
       vec[Nm ][0].elements[N] = M2;
       vec[NC ][0].elements[N] = color;
-      vec[NR ][0].elements[N] = catalog.average[i].R_PS;
-      vec[ND ][0].elements[N] = catalog.average[i].D_PS;
+      vec[NR ][0].elements[N] = catalog.average[i].R;
+      vec[ND ][0].elements[N] = catalog.average[i].D;
       vec[Nd1][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_dMAG);
       vec[Nd2][0].elements[N] = dM2;
@@ -133 +133 @@
   return (FALSE);
 
- escape:
+escape:
   
   if (RegionName != NULL) free (RegionName);

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

@@ -76 +76 @@
     catalog.filename = skylist[0].filename[Nr];
     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;
@@ -134 +134 @@
         vec[Nc ][0].elements[N] = color;
         vec[Ns ][0].elements[N] = Nstar;
-        vec[NR ][0].elements[N] = catalog.average[i].R_PS;
-        vec[ND ][0].elements[N] = catalog.average[i].D_PS;
+        vec[NR ][0].elements[N] = catalog.average[i].R;
+        vec[ND ][0].elements[N] = catalog.average[i].D;
       }
       Nstar ++; 
@@ -160 +160 @@
   return (FALSE);
 
- escape:
+escape:
   
   FreeImageSelection ();

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;

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;
       }

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

@@ -15 +15 @@
   
   for (i = 0; i < Naverage; i++) {
-    A = average[i].R_PS;
-    D = average[i].D_PS;
+    A = average[i].R;
+    D = average[i].D;
     SD =  cos(RAD_DEG*A + zeta)*sin(theta)*cos(RAD_DEG*D) + cos(theta)*sin(RAD_DEG*D);
     CD = sqrt (1 - SD*SD);
@@ -28 +28 @@
       RA += 360;
     
-    average[i].R_PS = RA;
-    average[i].D_PS = DEC; 
+    average[i].R = RA;
+    average[i].D = DEC; 
   }
 
@@ -59 +59 @@
     j = (l << 1) + 1;
     while (j <= ir) {
-      if (j < ir && ave[j].R_PS < ave[j+1].R_PS) j++;
-      if (tmp.R_PS < ave[j].R_PS) {
+      if (j < ir && ave[j].R < ave[j+1].R) j++;
+      if (tmp.R < ave[j].R) {
         ave[i] = ave[j];
         j += (i=j) + 1;

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

@@ -72 +72 @@
   catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
-  case 2:
-    unlock_catalog (&catalog);
-  case 0:
-    return (FALSE);
+    case 2:
+      unlock_catalog (&catalog);
+    case 0:
+      return (FALSE);
   }
   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
@@ -92 +92 @@
   /* stars are not guaranteed to be sorted in RA or in DEC, so first sort the list */
   for (i = 0; i < Nstars; i++) {
-    RA[i] = catalog.average[i].R_PS;
-    DEC[i] = catalog.average[i].D_PS;
+    RA[i] = catalog.average[i].R;
+    DEC[i] = catalog.average[i].D;
     N1[i] = i;
   }
@@ -138 +138 @@
       k = N1[i];
       if (!QUIET) {
-          fprintf (GetOutfile(), "star: %d\n", k);
-          fprintf (GetOutfile(), "%9.5f %9.5f %3d of %3d  %4.1f %5d\n", catalog.average[k].R_PS, catalog.average[k].D_PS, 
-                   catalog.average[k].Nm, catalog.average[k].Nn + catalog.average[k].Nm,
-                   0.01*catalog.average[k].Xp, catalog.average[k].code);
+        fprintf (GetOutfile(), "star: %d\n", k);
+        fprintf (GetOutfile(), "%9.5f %9.5f %3d of %3d  %4.1f %5d\n", catalog.average[k].R, catalog.average[k].D, 
+                 catalog.average[k].Nm, catalog.average[k].Nn + catalog.average[k].Nm,
+                 0.01*catalog.average[k].Xp, catalog.average[k].code);
       
-          /* filter names -- primary code is 0 in this function */
-          for (j = 0; j < Nsec + 1; j++) {
-              code = GetPhotcodebyNsec (j);
-              fprintf (GetOutfile (), "%s ", code[0].name);
-          }
-          fprintf (GetOutfile (), "\n");
-
-          /* average mags */
-          print_value (GetOutfile(), catalog.average[k].M_PS, catalog.average[k].M_PS);
-          for (j = 0; j < Nsec; j++) print_value (GetOutfile(), catalog.secfilt[j + Nsec*k].M_PS, catalog.secfilt[j + Nsec*k].M_PS);
-          fprintf (GetOutfile(), "\n");
-
-          /* average mag errors */
-          print_value (GetOutfile(), catalog.average[k].dM_PS, catalog.average[k].dM_PS);
-          for (j = 0; j < Nsec; j++) print_value (GetOutfile(), catalog.secfilt[j + Nsec*k].dM_PS, catalog.secfilt[j + Nsec*k].dM_PS);
-          fprintf (GetOutfile(), "\n");
-
-          /* average mag chisq */
-          print_value (GetOutfile(), pow (10.0, 0.01*catalog.average[k].Xm), catalog.average[k].Xm);
-          for (j = 0; j < Nsec; j++) print_value (GetOutfile(), pow (10.0, 0.01*catalog.secfilt[j + Nsec*k].Xm), catalog.secfilt[j + Nsec*k].Xm);
-          fprintf (GetOutfile(), "\n");
+        /* filter names -- primary code is 0 in this function */
+        for (j = 0; j < Nsec + 1; j++) {
+          code = GetPhotcodebyNsec (j);
+          fprintf (GetOutfile (), "%s ", code[0].name);
+        }
+        fprintf (GetOutfile (), "\n");
+
+        /* average mags */
+        print_value (GetOutfile(), catalog.average[k].M, catalog.average[k].M);
+        for (j = 0; j < Nsec; j++) print_value (GetOutfile(), catalog.secfilt[j + Nsec*k].M_PS, catalog.secfilt[j + Nsec*k].M_PS);
+        fprintf (GetOutfile(), "\n");
+
+        /* average mag errors */
+        print_value (GetOutfile(), catalog.average[k].dM, catalog.average[k].dM);
+        for (j = 0; j < Nsec; j++) print_value (GetOutfile(), catalog.secfilt[j + Nsec*k].dM_PS, catalog.secfilt[j + Nsec*k].dM_PS);
+        fprintf (GetOutfile(), "\n");
+
+        /* average mag chisq */
+        print_value (GetOutfile(), pow (10.0, 0.01*catalog.average[k].Xm), catalog.average[k].Xm);
+        for (j = 0; j < Nsec; j++) print_value (GetOutfile(), pow (10.0, 0.01*catalog.secfilt[j + Nsec*k].Xm), catalog.secfilt[j + Nsec*k].Xm);
+        fprintf (GetOutfile(), "\n");
       }
 

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

@@ -122 +122 @@
     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;
@@ -136 +136 @@
     /* assign vector values */
     switch (mode) {
-    case (1):  /* ra */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        n = catalog.measure[i].averef;
-        vec[0].elements[N] = catalog.average[n].R_PS - catalog.measure[i].dR_PS / 3600.0;
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (2):  /* dec */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        n = catalog.measure[i].averef;
-        vec[0].elements[N] = catalog.average[n].D_PS - catalog.measure[i].dD_PS / 3600.0;
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (3):  /* mag */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].M_PS;
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (4):  /* dmag */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].dM_PS;
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (5):  /* Mcal */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].Mcal_PS;
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (6):  /* Mrel */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        n = catalog.measure[i].averef;
-        vec[0].elements[N] = catalog.average[n].M_PS;
-        N++;
-      }
-      break;
-    case (7):  /* source */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].source;
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (10):  /* time */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
-        N++;
-        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
+      case (1):  /* ra */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          n = catalog.measure[i].averef;
+          vec[0].elements[N] = catalog.average[n].R - catalog.measure[i].dR_PS / 3600.0;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
+      case (2):  /* dec */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          n = catalog.measure[i].averef;
+          vec[0].elements[N] = catalog.average[n].D - catalog.measure[i].dD_PS / 3600.0;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
+      case (3):  /* mag */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          vec[0].elements[N] = catalog.measure[i].M_PS;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
+      case (4):  /* dmag */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          vec[0].elements[N] = catalog.measure[i].dM_PS;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
+      case (5):  /* Mcal */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          vec[0].elements[N] = catalog.measure[i].Mcal_PS;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
+      case (6):  /* Mrel */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          n = catalog.measure[i].averef;
+          vec[0].elements[N] = catalog.average[n].M;
+          N++;
+        }
+        break;
+      case (7):  /* source */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          vec[0].elements[N] = catalog.measure[i].source;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
+      case (10):  /* time */
+        for (i = 0; i < catalog.Nmeasure; i++) {
+          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+          vec[0].elements[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
+          N++;
+          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+        }
+        break;
     }
     if (catalog.average != 0) {

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

@@ -83 +83 @@
   catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
-  case 2:
-    unlock_catalog (&catalog);
-  case 0:
-    return (FALSE);
+    case 2:
+      unlock_catalog (&catalog);
+    case 0:
+      return (FALSE);
   }
   catalog.catflags = LOAD_AVES | LOAD_MEAS;
@@ -103 +103 @@
   /* stars are not guaranteed to be sorted in RA or in DEC, so first sort the list */
   for (i = 0; i < Nstars; i++) {
-    RA[i] = catalog.average[i].R_PS;
-    DEC[i] = catalog.average[i].D_PS;
+    RA[i] = catalog.average[i].R;
+    DEC[i] = catalog.average[i].D;
     N1[i] = i;
   }

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

@@ -59 +59 @@
   catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
-  case 2:
-    unlock_catalog (&catalog);
-  case 0:
-    return (FALSE);
+    case 2:
+      unlock_catalog (&catalog);
+    case 0:
+      return (FALSE);
   }
   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
@@ -79 +79 @@
   /* stars are not guaranteed to be sorted in RA or in DEC, so first sort the list */
   for (i = 0; i < Nstars; i++) {
-    RA[i] = catalog.average[i].R_PS;
-    DEC[i] = catalog.average[i].D_PS;
+    RA[i] = catalog.average[i].R;
+    DEC[i] = catalog.average[i].D;
     N1[i] = i;
   }

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

@@ -58 +58 @@
     catalog.filename = skylist[0].filename[i];
     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;

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

@@ -225 +225 @@
 
   param = AVE_ZERO;
-  if (!strcasecmp (parname, "ra"))    param = AVE_RA;
-  if (!strcasecmp (parname, "dec"))   param = AVE_DEC;
+  if (!strcasecmp (parname, "RA"))    param = AVE_RA;
+  if (!strcasecmp (parname, "DEC"))   param = AVE_DEC;
+
+  if (!strcasecmp (parname, "dRA"))   param = AVE_RA_ERR;
+  if (!strcasecmp (parname, "dDEC"))  param = AVE_DEC_ERR;
+
+  if (!strcasecmp (parname, "uRA"))   param = AVE_U_RA;
+  if (!strcasecmp (parname, "uDEC"))  param = AVE_U_DEC;
+  if (!strcasecmp (parname, "duRA"))  param = AVE_U_RA_ERR;
+  if (!strcasecmp (parname, "duDEC")) param = AVE_U_DEC_ERR;
+
+  if (!strcasecmp (parname, "par"))   param = AVE_PAR;
+  if (!strcasecmp (parname, "dpar"))  param = AVE_PAR_ERR;
+
   if (!strcasecmp (parname, "dmag"))  param = AVE_dMAG;
   if (!strcasecmp (parname, "mag"))   param = AVE_MAG;
@@ -564 +576 @@
   switch (param) {
     case AVE_RA:
-      value = average[0].R_PS;
+      value = average[0].R;
       break;
     case AVE_DEC:
-      value = average[0].D_PS;
-      break;
+      value = average[0].D;
+      break;
+    case AVE_RA_ERR:
+      value = average[0].dR;
+      break;
+    case AVE_DEC_ERR:
+      value = average[0].dD;
+      break;
+
+    case AVE_U_RA:
+      value = average[0].uR;
+      break;
+    case AVE_U_DEC:
+      value = average[0].uD;
+      break;
+    case AVE_U_RA_ERR:
+      value = average[0].duR;
+      break;
+    case AVE_U_DEC_ERR:
+      value = average[0].duD;
+      break;
+
+    case AVE_PAR:
+      value = average[0].P;
+      break;
+    case AVE_PAR_ERR:
+      value = average[0].dP;
+      break;
+
+
     case AVE_NMEAS:
       value = average[0].Nm;
@@ -924 +964 @@
   }
 
- skip: 
+skip: 
   if (M1 != NULL) free (M1);
   if (M2 != NULL) free (M2);
@@ -1058 +1098 @@
       break;
     case MEAS_RA: /* OK */
-      value = average[0].R_PS - measure[0].dR_PS / 3600.0;
+      value = average[0].R - measure[0].dR_PS / 3600.0;
       break;
     case MEAS_DEC: /* OK */
-      value = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      value = average[0].D - measure[0].dD_PS / 3600.0;
       break;
     case MEAS_dMAG: /* OK */
@@ -1094 +1134 @@
       break;
     case MEAS_XCCD: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       image = MatchImage (measure[0].t, measure[0].source);
       if (image == NULL) break;
@@ -1102 +1142 @@
       break;
     case MEAS_YCCD: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       image = MatchImage (measure[0].t, measure[0].source);
       if (image == NULL) break;
@@ -1110 +1150 @@
       break;
     case MEAS_XMOSAIC: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       mosaic = MatchMosaic (measure[0].t, measure[0].source);
       if (mosaic == NULL) break;
@@ -1118 +1158 @@
       break;
     case MEAS_YMOSAIC: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       mosaic = MatchMosaic (measure[0].t, measure[0].source);
       if (mosaic == NULL) break;

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 ++;
       }

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

@@ -43 +43 @@
   catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
-  case 2:
-    unlock_catalog (&catalog);
-  case 0:
-    return (FALSE);
+    case 2:
+      unlock_catalog (&catalog);
+    case 0:
+      return (FALSE);
   }
   catalog.catflags = LOAD_AVES | LOAD_MEAS;
@@ -61 +61 @@
   ALLOCATE (index, int, Nstars);
   for (i = 0; i < Nstars; i++) {
-    RA[i] = catalog.average[i].R_PS;
-    DEC[i] = catalog.average[i].D_PS;
+    RA[i] = catalog.average[i].R;
+    DEC[i] = catalog.average[i].D;
     index[i] = i;
   }

trunk/Ohana/src/opihi/include/dvo1.h

@@ -15 +15 @@
 
 /* average params */
-enum {AVE_ZERO, AVE_RA, AVE_DEC, AVE_MAG, AVE_REF, AVE_dMAG, AVE_Xm, AVE_Xp, AVE_NMEAS, 
-      AVE_NMISS, AVE_TYPE, AVE_NPHOT, AVE_NCODE, AVE_NCRIT, AVE_FLAG, AVE_TYPEFRAC};
+enum {AVE_ZERO, AVE_RA, AVE_DEC, AVE_RA_ERR, AVE_DEC_ERR, AVE_U_RA, AVE_U_DEC, 
+      AVE_U_RA_ERR, AVE_U_DEC_ERR, AVE_PAR, AVE_PAR_ERR, AVE_MAG, AVE_REF, AVE_dMAG, 
+      AVE_Xm, AVE_Xp, AVE_NMEAS, AVE_NMISS, AVE_TYPE, AVE_NPHOT, AVE_NCODE, AVE_NCRIT, 
+      AVE_FLAG, AVE_TYPEFRAC};
 
 typedef struct {