Changeset 28338 for branches/czw_branch/20100519/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Jun 15, 2010, 1:12:26 PM (16 years ago)

Author:

watersc1

Message:

Change to make stack summary code run at 9PM HST to attempt to dodge a race condition. Probablyl not a final solution, but will work for now.

Location:

branches/czw_branch/20100519

Files:

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

branches/czw_branch/20100519/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);
             }