Changeset 30479

Timestamp:

Feb 3, 2011, 9:36:20 AM (15 years ago)

Author:

eugene

Message:

values like FWx, Mxx, measure.theta are now converted to/from internal formats with "To/From Short Pixels/Degrees" functions; update some usage info

Location:

branches/eam_branches/ipp-20101205/Ohana/src/opihi

Files:

• cmd.astro/cgrid.c (modified) (1 diff)
• dvo/dbExtractMeasures.c (modified) (2 diffs)
• dvo/gstar.c (modified) (3 diffs)
• dvo/photometry.c (modified) (3 diffs)
• dvo/skycat.c (modified) (1 diff)

branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.astro/cgrid.c

@@ -98 +98 @@
 
   if (argc != 1) {
-    gprint (GP_ERR, "USAGE: cgrid [style]\n");
+    gprint (GP_ERR, "USAGE: cgrid [style] [-ra-by-hour] [-labels]\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -320 +320 @@
       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 +382 @@
       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 */

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/gstar.c

@@ -222 +222 @@
             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 +233 @@
                 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 +244 @@
                 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");

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/photometry.c

@@ -778 +778 @@
   } 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 +810 @@
     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 +1166 @@
       break;
     case MEAS_FWHM: /* OK */
-      value = 0.01*measure[0].FWx;
+      value = FromShortPixels(measure[0].FWx);
       break;
     case MEAS_DB_FLAGS: /* ? */

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/skycat.c

@@ -36 +36 @@
 
   if (argc != 1) {
-    gprint (GP_ERR, "USAGE: skycat [-all]\n");
+    gprint (GP_ERR, "USAGE: skycat [-all] [-depth depth] [-v]\n");
     return (FALSE);
   }