Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.astro/cgrid.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.astro/cgrid.c	(revision 30478)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.astro/cgrid.c	(revision 30479)
@@ -98,5 +98,5 @@
 
   if (argc != 1) {
-    gprint (GP_ERR, "USAGE: cgrid [style]\n");
+    gprint (GP_ERR, "USAGE: cgrid [style] [-ra-by-hour] [-labels]\n");
     return (FALSE);
   }
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractMeasures.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractMeasures.c	(revision 30478)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractMeasures.c	(revision 30479)
@@ -320,23 +320,23 @@
       break;
     case MEAS_FWHM: /* OK */
-      value.Flt = 0.01*(measure[0].FWx + measure[0].FWy) / 2.0;
+      value.Flt = FromShortPixels(measure[0].FWx + measure[0].FWy) / 2.0;
       break;
     case MEAS_FWHM_MAJ: /* OK */
-      value.Flt = 0.01*measure[0].FWx;
+      value.Flt = FromShortPixels(measure[0].FWx);
       break;
     case MEAS_FWHM_MIN: /* OK */
-      value.Flt = 0.01*measure[0].FWy;
+      value.Flt = FromShortPixels(measure[0].FWy);
       break;
     case MEAS_THETA: /* OK */
-      value.Flt = measure[0].theta;
+      value.Flt = FromShortDegrees(measure[0].theta);
       break;
     case MEAS_MXX: /* OK */
-      value.Flt = measure[0].Mxx;
+      value.Flt = FromShortPixels(measure[0].Mxx);
       break;
     case MEAS_MXY: /* OK */
-      value.Flt = measure[0].Mxy;
+      value.Flt = FromShortPixels(measure[0].Mxy);
       break;
     case MEAS_MYY: /* OK */
-      value.Flt = measure[0].Myy;
+      value.Flt = FromShortPixels(measure[0].Myy);
       break;
     case MEAS_DOPHOT: /* OK */
@@ -382,8 +382,8 @@
       break;
     case MEAS_XCCD_ERR: /* OK */
-      value.Flt = measure[0].dXccd / 100.0;
+      value.Flt = FromShortPixels(measure[0].dXccd);
       break;
     case MEAS_YCCD_ERR: /* OK */
-      value.Flt = measure[0].dYccd / 100.0;
+      value.Flt = FromShortPixels(measure[0].dYccd);
       break;
     case MEAS_XMOSAIC: /* OK */
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/gstar.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/gstar.c	(revision 30478)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/gstar.c	(revision 30479)
@@ -222,6 +222,6 @@
 	    gprint (GP_LOG, "%5d ",    catalog.measure[m].photcode);
 	    gprint (GP_LOG, "%-20s ",  GetPhotcodeNamebyCode (catalog.measure[m].photcode));
- 	    gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWx);
-	    gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWy);
+ 	    gprint (GP_LOG, "%5.2f ",  FromShortPixels(catalog.measure[m].FWx));
+	    gprint (GP_LOG, "%5.2f ",  FromShortPixels(catalog.measure[m].FWy));
 
 	    if (FULL_OUTPUT) {
@@ -233,6 +233,6 @@
 		gprint (GP_LOG, "%f ", catalog.measure[m].Xccd);
 		gprint (GP_LOG, "%f ", catalog.measure[m].Yccd);
-		gprint (GP_LOG, "%d ", catalog.measure[m].dXccd);
-		gprint (GP_LOG, "%d ", catalog.measure[m].dYccd);
+		gprint (GP_LOG, "%f ", FromShortPixels(catalog.measure[m].dXccd));
+		gprint (GP_LOG, "%f ", FromShortPixels(catalog.measure[m].dYccd));
 		gprint (GP_LOG, "%f ", catalog.measure[m].Sky);
 		gprint (GP_LOG, "%f ", catalog.measure[m].dSky);
@@ -244,5 +244,5 @@
 		gprint (GP_LOG, "%f ", catalog.measure[m].crNsigma);
 		gprint (GP_LOG, "%f ", catalog.measure[m].extNsigma);
-		gprint (GP_LOG, "%f ", (360.0/(float)0xffff)*catalog.measure[m].theta);
+		gprint (GP_LOG, "%f ", FromShortDegrees(catalog.measure[m].theta));
 	    }
 	    gprint (GP_LOG, "\n");
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/photometry.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/photometry.c	(revision 30478)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/photometry.c	(revision 30479)
@@ -778,6 +778,6 @@
   } else {
     
-    if (0.01 * measure[0].FWx < 3.0) return (FALSE);
-    if (0.01 * measure[0].FWx > 10.0) return (FALSE);
+    if (FromShortPixels(measure[0].FWx < 3.0)) return (FALSE);
+    if (FromShortPixels(measure[0].FWx > 10.0)) return (FALSE);
 
     return (TRUE);
@@ -810,5 +810,5 @@
     Nm = 0;
     for (i = 0; i < average[0].Nmeasure; i++) {
-      fwhm = measure[i].FWx / 100.0;
+      fwhm = FromShortPixels(measure[i].FWx);
       switch (FWHMsign) {
 	case 0:
@@ -1166,5 +1166,5 @@
       break;
     case MEAS_FWHM: /* OK */
-      value = 0.01*measure[0].FWx;
+      value = FromShortPixels(measure[0].FWx);
       break;
     case MEAS_DB_FLAGS: /* ? */
Index: /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/skycat.c
===================================================================
--- /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/skycat.c	(revision 30478)
+++ /branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/skycat.c	(revision 30479)
@@ -36,5 +36,5 @@
 
   if (argc != 1) {
-    gprint (GP_ERR, "USAGE: skycat [-all]\n");
+    gprint (GP_ERR, "USAGE: skycat [-all] [-depth depth] [-v]\n");
     return (FALSE);
   }