Index: trunk/Ohana/src/opihi/dvo/calextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/calextract.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/calextract.c	(revision 4800)
@@ -103,6 +103,6 @@
       vec[Nm ][0].elements[N] = M2;
       vec[NC ][0].elements[N] = color;
-      vec[NR ][0].elements[N] = catalog.average[i].R;
-      vec[ND ][0].elements[N] = catalog.average[i].D;
+      vec[NR ][0].elements[N] = catalog.average[i].R_PS;
+      vec[ND ][0].elements[N] = catalog.average[i].D_PS;
       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;
Index: trunk/Ohana/src/opihi/dvo/calmextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/calmextract.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/calmextract.c	(revision 4800)
@@ -138,6 +138,6 @@
 	vec[Nc ][0].elements[N] = color;
 	vec[Ns ][0].elements[N] = Nstar;
-	vec[NR ][0].elements[N] = catalog.average[i].R;
-	vec[ND ][0].elements[N] = catalog.average[i].D;
+	vec[NR ][0].elements[N] = catalog.average[i].R_PS;
+	vec[ND ][0].elements[N] = catalog.average[i].D_PS;
       }
       Nstar ++; 
Index: trunk/Ohana/src/opihi/dvo/catalog.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/catalog.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/catalog.c	(revision 4800)
@@ -196,6 +196,6 @@
 	dparse (&D, Ad, tbuffer);
 	dparse (&M, Am, tbuffer);
-	catalog.average[nstar].R = R;
-	catalog.average[nstar].D = D;
+	catalog.average[nstar].R_PS = R;
+	catalog.average[nstar].D_PS = D;
 	catalog.average[nstar].M = M * 1000.0;
 	nstar++;
@@ -238,6 +238,6 @@
 	  dparse (&D, Ad, &tbuffer[i*Bytes_Star]);
 	  dparse (&M, Am, &tbuffer[i*Bytes_Star]);
-	  catalog.average[nstar].R = R;
-	  catalog.average[nstar].D = D;
+	  catalog.average[nstar].R_PS = R;
+	  catalog.average[nstar].D_PS = D;
 	  catalog.average[nstar].M = M * 1000.0;
 	  nstar++;
@@ -288,6 +288,6 @@
 	  dparse (&D, 2, &tbuffer[i*BYTES_STAR]);
 	  dparse (&M, 3, &tbuffer[i*BYTES_STAR]);
-	  catalog.average[nstar].R = R;
-	  catalog.average[nstar].D = D;
+	  catalog.average[nstar].R_PS = R;
+	  catalog.average[nstar].D_PS = D;
 	  catalog.average[nstar].M = M * 1000.0;
 	  nstar++;
@@ -347,7 +347,7 @@
 	if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
 	if (Zvec.elements[N] < 0.011) continue;
-	while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-	while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
-	if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N ++;
+	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;
+	if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N ++;
       }
       break;
@@ -362,7 +362,7 @@
 	if (Zvec.elements[N] == 0.01) 
 	  continue;
-	while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-	while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
-	if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N++;
+	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;
+	if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N++;
       }
       break;
@@ -377,7 +377,7 @@
 	if (Zvec.elements[N] == 0.01) 
 	  continue;
-	while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-	while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
-	if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N++;
+	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;
+	if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N++;
       }
       break;
Index: trunk/Ohana/src/opihi/dvo/cmatch.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/cmatch.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/cmatch.c	(revision 4800)
@@ -85,6 +85,6 @@
       dparse (&D, 2, &tbuffer[i*BYTES_STAR]);
       dparse (&M, 3, &tbuffer[i*BYTES_STAR]);
-      catalog2.average[nstar].R = R;
-      catalog2.average[nstar].D = D;
+      catalog2.average[nstar].R_PS = R;
+      catalog2.average[nstar].D_PS = D;
       catalog2.average[nstar].M = M * 1000.0;
       nstar++;
Index: trunk/Ohana/src/opihi/dvo/compare.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/compare.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/compare.c	(revision 4800)
@@ -19,5 +19,5 @@
   for (i = j = 0; (i < catlog1[0].Naverage) && (j < catlog2[0].Naverage);) {
     
-    dX = catlog1[0].average[i].R - catlog2[0].average[j].R;
+    dX = catlog1[0].average[i].R_PS - catlog2[0].average[j].R_PS;
 
     if (!(i % 100))
@@ -32,10 +32,10 @@
       first_j = j;
       for (j = first_j; (fabs (dX) < radius) && (j < catlog2[0].Naverage); j++) {
-	dX = catlog1[0].average[i].R - catlog2[0].average[j].R;
-	dY = catlog1[0].average[i].D - catlog2[0].average[j].D;
+	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;
 	dR = hypot (dX, dY);
 	if (dR < radius) {
-	   rvec[0].elements[Nmatch] = catlog1[0].average[i].R;
-	   dvec[0].elements[Nmatch] = catlog1[0].average[i].D;
+	   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;
 	  drvec[0].elements[Nmatch] = dX;
Index: trunk/Ohana/src/opihi/dvo/dmt.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmt.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/dmt.c	(revision 4800)
@@ -97,6 +97,6 @@
       Yvec.elements[N] = (dmt1 + dmt2) / 2.0;
       if (SaveVectors) {
-	Rvec.elements[N] = catalog.average[i].R;
-	Dvec.elements[N] = catalog.average[i].D;
+	Rvec.elements[N] = catalog.average[i].R_PS;
+	Dvec.elements[N] = catalog.average[i].D_PS;
 	Zvec.elements[N] = M0;
       }
Index: trunk/Ohana/src/opihi/dvo/dvomisc.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dvomisc.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/dvomisc.c	(revision 4800)
@@ -15,6 +15,6 @@
   
   for (i = 0; i < Naverage; i++) {
-    A = average[i].R;
-    D = average[i].D;
+    A = average[i].R_PS;
+    D = average[i].D_PS;
     SD =  cos(RAD_DEG*A + zeta)*sin(theta)*cos(RAD_DEG*D) + cos(theta)*sin(RAD_DEG*D);
     CD = sqrt (1 - SD*SD);
@@ -28,6 +28,6 @@
       RA += 360;
     
-    average[i].R = RA;
-    average[i].D = DEC; 
+    average[i].R_PS = RA;
+    average[i].D_PS = DEC; 
   }
 
@@ -59,6 +59,6 @@
     j = (l << 1) + 1;
     while (j <= ir) {
-      if (j < ir && ave[j].R < ave[j+1].R) j++;
-      if (tmp.R < ave[j].R) {
+      if (j < ir && ave[j].R_PS < ave[j+1].R_PS) j++;
+      if (tmp.R_PS < ave[j].R_PS) {
 	ave[i] = ave[j];
 	j += (i=j) + 1;
Index: trunk/Ohana/src/opihi/dvo/gstar.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/gstar.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/gstar.c	(revision 4800)
@@ -81,6 +81,6 @@
   /* 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;
-    DEC[i] = catalog.average[i].D;
+    RA[i] = catalog.average[i].R_PS;
+    DEC[i] = catalog.average[i].D_PS;
     N1[i] = i;
   }
@@ -127,5 +127,5 @@
       k = N1[i];
       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, 
+      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);
@@ -164,5 +164,5 @@
 	    fprintf (GetOutfile(), "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n", 
 		     Mcat, Mrel, 0.001*catalog.measure[m].dM,
-		     date, 0.01*catalog.measure[m].dR, 0.01*catalog.measure[m].dD,
+		     date, catalog.measure[m].dR_PS, catalog.measure[m].dD_PS,
 		     catalog.measure[m].dophot, catalog.measure[m].flags,
 		     catalog.measure[m].source, GetPhotcodeNamebyCode (catalog.measure[m].source));
Index: trunk/Ohana/src/opihi/dvo/imdata.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imdata.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/imdata.c	(revision 4800)
@@ -134,5 +134,5 @@
 	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 / 360000.0;
+	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);
@@ -143,5 +143,5 @@
 	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 / 360000.0;
+	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);
Index: trunk/Ohana/src/opihi/dvo/lcurve.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/lcurve.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/lcurve.c	(revision 4800)
@@ -101,6 +101,6 @@
   /* 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;
-    DEC[i] = catalog.average[i].D;
+    RA[i] = catalog.average[i].R_PS;
+    DEC[i] = catalog.average[i].D_PS;
     N1[i] = i;
   }
Index: trunk/Ohana/src/opihi/dvo/lightcurve.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/lightcurve.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/lightcurve.c	(revision 4800)
@@ -78,6 +78,6 @@
   /* 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;
-    DEC[i] = catalog.average[i].D;
+    RA[i] = catalog.average[i].R_PS;
+    DEC[i] = catalog.average[i].D_PS;
     N1[i] = i;
   }
Index: trunk/Ohana/src/opihi/dvo/photometry.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/photometry.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/photometry.c	(revision 4800)
@@ -564,8 +564,8 @@
   switch (param) {
     case AVE_RA:
-      value = average[0].R;
+      value = average[0].R_PS;
       break;
     case AVE_DEC:
-      value = average[0].D;
+      value = average[0].D_PS;
       break;
     case AVE_NMEAS:
@@ -1057,8 +1057,8 @@
       break;
     case MEAS_RA: /* OK */
-      value = average[0].R - measure[0].dR / 360000.0;
+      value = average[0].R_PS - measure[0].dR_PS / 3600.0;
       break;
     case MEAS_DEC: /* OK */
-      value = average[0].D - measure[0].dD / 360000.0;
+      value = average[0].D_PS - measure[0].dD_PS / 3600.0;
       break;
     case MEAS_dMAG: /* OK */
@@ -1078,8 +1078,8 @@
       break;
     case MEAS_dR: /* OK */
-      value = 0.01*measure[0].dR;
+      value = measure[0].dR_PS;
       break;
     case MEAS_dD: /* OK */
-      value = 0.01*measure[0].dD;
+      value = measure[0].dD_PS;
       break;
     case MEAS_FWHM: /* OK */
@@ -1093,6 +1093,6 @@
       break;
     case MEAS_XCCD: /* OK */
-      ra  = average[0].R - measure[0].dR / 360000.0;
-      dec = average[0].D - measure[0].dD / 360000.0;
+      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
+      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
       image = MatchImage (measure[0].t, measure[0].source);
       if (image == NULL) break;
@@ -1101,6 +1101,6 @@
       break;
     case MEAS_YCCD: /* OK */
-      ra  = average[0].R - measure[0].dR / 360000.0;
-      dec = average[0].D - measure[0].dD / 360000.0;
+      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
+      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
       image = MatchImage (measure[0].t, measure[0].source);
       if (image == NULL) break;
@@ -1109,6 +1109,6 @@
       break;
     case MEAS_XMOSAIC: /* OK */
-      ra  = average[0].R - measure[0].dR / 360000.0;
-      dec = average[0].D - measure[0].dD / 360000.0;
+      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
+      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
       mosaic = MatchMosaic (measure[0].t, measure[0].source);
       if (mosaic == NULL) break;
@@ -1117,6 +1117,6 @@
       break;
     case MEAS_YMOSAIC: /* OK */
-      ra  = average[0].R - measure[0].dR / 360000.0;
-      dec = average[0].D - measure[0].dD / 360000.0;
+      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
+      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
       mosaic = MatchMosaic (measure[0].t, measure[0].source);
       if (mosaic == NULL) break;
Index: trunk/Ohana/src/opihi/dvo/pmeasure.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/pmeasure.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/pmeasure.c	(revision 4800)
@@ -121,6 +121,6 @@
     for (N = i = 0; i < catalog.Naverage; i++) {
       if (IDclip && (catalog.average[i].code != IDchoice)) continue;
-      while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-      while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
+      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;
       m = catalog.average[i].offset;
       for (k = 0; k < catalog.average[i].Nm; k++) {
@@ -134,5 +134,5 @@
 	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 - 2.777e-6*catalog.measure[m+k].dR, catalog.average[i].D - 2.777e-6*catalog.measure[m+k].dD, &graphmode.coords);
+	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);
 	N ++;
       }
Index: trunk/Ohana/src/opihi/dvo/subpix.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/subpix.c	(revision 4782)
+++ trunk/Ohana/src/opihi/dvo/subpix.c	(revision 4800)
@@ -61,6 +61,6 @@
   ALLOCATE (index, int, Nstars);
   for (i = 0; i < Nstars; i++) {
-    RA[i] = catalog.average[i].R;
-    DEC[i] = catalog.average[i].D;
+    RA[i] = catalog.average[i].R_PS;
+    DEC[i] = catalog.average[i].D_PS;
     index[i] = i;
   }