Changeset 38307

Timestamp:

May 22, 2015, 8:08:37 PM (11 years ago)

Author:

eugene

Message:

better formatting for gstar flags; do not allow negative range for cdensify

Location:

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

Files:

• cmd.astro/cdensify.c (modified) (1 diff)
• dvo/gstar.c (modified) (2 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/opihi/cmd.astro/cdensify.c

@@ -73 +73 @@
   CHECKVAL(dY);
 
-  Nx = (Xmax - Xmin) / dX + 1;
-  Ny = (Ymax - Ymin) / dY + 1;
+  Nx = abs((Xmax - Xmin) / dX) + 1;
+  Ny = abs((Ymax - Ymin) / dY) + 1;
   
   Coords newcoords = graphmode.coords;

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

@@ -310 +310 @@
         gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
         gprint (GP_LOG, "%4.1f ",  catalog.average[k].ChiSqAve);
-        gprint (GP_LOG, "%5x ",    catalog.average[k].flags);
-        gprint (GP_LOG, "%x ",     catalog.average[k].objID);
-        gprint (GP_LOG, "%x ",     catalog.average[k].catID);
+        gprint (GP_LOG, "0x%08x ", catalog.average[k].flags);
+        gprint (GP_LOG, "0x%08x ", catalog.average[k].objID);
+        gprint (GP_LOG, "0x%08x ", catalog.average[k].catID);
         
         if (FULL_OUTPUT) {
@@ -774 +774 @@
     case GSTAR_SECF_FLAGS: /* secfilt flags */
       if (seq == -1) {
-        gprint (GP_LOG, "%08x ", 0);
-      } else {
-        gprint (GP_LOG, "%08x ", secfilt[seq].flags);
+        gprint (GP_LOG, "0x%08x ", 0);
+      } else {
+        gprint (GP_LOG, "0x%08x ", secfilt[seq].flags);
       }
       break;