Changeset 28326

Timestamp:

Jun 15, 2010, 9:34:15 AM (16 years ago)

Author:

eugene

Message:

add objID and catID to basic output; objflags in hex

File:

• trunk/Ohana/src/opihi/dvo/gstar.c (modified) (3 diffs)

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

@@ -165 +165 @@
         gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
         gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
-        gprint (GP_LOG, "%5d ",     catalog.average[k].flags);
+        gprint (GP_LOG, "%5x ",    catalog.average[k].flags);
+        gprint (GP_LOG, "%x ",     catalog.average[k].objID);
+        gprint (GP_LOG, "%x ",     catalog.average[k].catID);
         
         if (FULL_OUTPUT) {
@@ -176 +178 @@
             gprint (GP_LOG, "%f ",     catalog.average[k].P);
             gprint (GP_LOG, "%f ",     catalog.average[k].dP);
-            gprint (GP_LOG, "%x ",     catalog.average[k].objID);
-            gprint (GP_LOG, "%x ",     catalog.average[k].catID);
         }
 
@@ -244 +244 @@
                 gprint (GP_LOG, "%f ", catalog.measure[m].crNsigma);
                 gprint (GP_LOG, "%f ", catalog.measure[m].extNsigma);
-                gprint (GP_LOG, "%f ", 0.01*catalog.measure[m].FWx);
-                gprint (GP_LOG, "%f ", 0.01*catalog.measure[m].FWy);
                 gprint (GP_LOG, "%f ", (360.0/(float)0xffff)*catalog.measure[m].theta);
             }