Changeset 40654 for trunk

Timestamp:

Mar 29, 2019, 5:06:07 AM (7 years ago)

Author:

eugene

Message:

add -mean option to medimage

File:

• trunk/Ohana/src/opihi/cmd.data/medimage_commands.c (modified) (2 diffs)

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

@@ -58 +58 @@
 int medimage_calc (int argc, char **argv) {
 
-  int ix, iy, n;
+  int ix, iy, n, N;
   Buffer *output;
 
-  if (argc != 3) {
-    gprint (GP_ERR, "USAGE: medimage calc (name) (output)\n");
+  int CALC_MEAN = FALSE;
+  if ((N = get_argument (argc, argv, "-mean"))) {
+    CALC_MEAN = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  if (argc != 3) {
+    gprint (GP_ERR, "USAGE: medimage calc (name) (output) [-mean]\n");
     gprint (GP_ERR, "       calculate the median image for the median image set\n");
     return FALSE;
@@ -101 +107 @@
       if (N == 0) continue;
 
-      fsort (value, N);
-      outvalue[Npix] = value[(int)(0.5*N)];
+      if (CALC_MEAN) {
+        float sum = 0.0;
+        for (n = 0; n < N; n++) {
+          sum += value[n];
+        }
+        outvalue[Npix] = sum / (float) N;
+      } else {
+        fsort (value, N);
+        outvalue[Npix] = value[(int)(0.5*N)];
+      }
     }
   }