Changeset 11231

Timestamp:

Jan 22, 2007, 2:54:26 PM (19 years ago)

Author:

eugene

Message:

added default choice to stats

File:

• trunk/Ohana/src/opihi/cmd.data/stats.c (modified) (4 diffs)

trunk/Ohana/src/opihi/cmd.data/stats.c

@@ -29 +29 @@
   }
 
-  if (argc != 6) {
+  if ((argc != 2) | (argc != 6)) {
     gprint (GP_ERR, "USAGE: stats <buffer> sx sy nx ny\n");
+    gprint (GP_ERR, "OR:    stats <buffer>\n");
     return (FALSE);
   }
@@ -36 +37 @@
   if ((buf = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE);
 
-  sx = strcmp (argv[2], "-") ? atof (argv[2]) : 0;
-  sy = strcmp (argv[3], "-") ? atof (argv[3]) : 0;
-  nx = strcmp (argv[4], "-") ? atof (argv[4]) : buf[0].matrix.Naxis[0];
-  ny = strcmp (argv[5], "-") ? atof (argv[5]) : buf[0].matrix.Naxis[1];
+  if (argc == 2) {
+    sx = strcmp (argv[2], "-") ? atof (argv[2]) : 0;
+    sy = strcmp (argv[3], "-") ? atof (argv[3]) : 0;
+    nx = strcmp (argv[4], "-") ? atof (argv[4]) : buf[0].matrix.Naxis[0];
+    ny = strcmp (argv[5], "-") ? atof (argv[5]) : buf[0].matrix.Naxis[1];
+  } else {
+    sx = 0;
+    sy = 0;
+    nx = buf[0].matrix.Naxis[0];
+    ny = buf[0].matrix.Naxis[1];
+  }
 
   Npix = N1 = N2 = 0;
@@ -63 +71 @@
   N1 = N1 / Npix;
 
-  /* calculate mode, median */
+/* calculate mode, median */
   median = mode = 0.5*(max + min);
   if ((max - min) != 0) {
@@ -96 +104 @@
     gprint (GP_LOG, "  mean    stdev    min     max   median   Npix   Total\n");
     gprint (GP_LOG, "%7.4g %7.4g %7.4g %7.4g %7.4g %7.0f %7.4g\n", N1, sqrt (N2/Npix - N1*N1), 
-             min, max, median, Npix, Npix*N1);
+            min, max, median, Npix, Npix*N1);
   }