Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/vstat.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/cmd.data/vstat.c (modified) (3 diffs)

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

@@ -5 +5 @@
   int i, N;
   double max, min, sum, var, dvar, mean, stdev;
-  float *X, IgnoreValue;
+  float IgnoreValue;
   int Ignore, Quiet;
 
@@ -41 +41 @@
 
   /* calculate max, min, mean, sum, npix */
-  X = vec[0].elements;
   max = -HUGE_VAL;
   min = HUGE_VAL;
   sum = N = 0;
-  for (i = 0; i < vec[0].Nelements; i++, X++) {
-    if (!finite (*X)) continue;
-    if (Ignore && (*X == IgnoreValue)) continue;
-    max = MAX (*X, max);
-    min = MIN (*X, min);
-    sum += *X;
-    N++;
-  }      
+  if (vec[0].type == OPIHI_FLT) {
+    opihi_flt *X = vec[0].elements.Flt;
+    for (i = 0; i < vec[0].Nelements; i++, X++) {
+      if (!finite (*X)) continue;
+      if (Ignore && (*X == IgnoreValue)) continue;
+      max = MAX (*X, max);
+      min = MIN (*X, min);
+      sum += *X;
+      N++;
+    }      
+  } else {
+    opihi_int *X = vec[0].elements.Int;
+    for (i = 0; i < vec[0].Nelements; i++, X++) {
+      if (!finite (*X)) continue;
+      if (Ignore && (*X == IgnoreValue)) continue;
+      max = MAX (*X, max);
+      min = MIN (*X, min);
+      sum += *X;
+      N++;
+    }      
+  }
   mean = sum / N;
 
@@ -65 +77 @@
   ALLOCATE (Nval, int, 1002);
   bzero (Nval, 1000*sizeof(int));
-  X = vec[0].elements;
   var = 0;
-  for (i = 0; i < vec[0].Nelements; i++, X++) {
-    if (!finite (*X)) continue;
-    if (Ignore && (*X == IgnoreValue)) continue;
-    bin = MAX (0, MIN (1000, (*X - min) / dx));
-    Nval[bin] ++;
-    dvar = (*X - mean);
-    var += dvar*dvar;
-  }      
+  if (vec[0].type == OPIHI_FLT) {
+    opihi_flt *X = vec[0].elements.Flt;
+    for (i = 0; i < vec[0].Nelements; i++, X++) {
+      if (!finite (*X)) continue;
+      if (Ignore && (*X == IgnoreValue)) continue;
+      bin = MAX (0, MIN (1000, (*X - min) / dx));
+      Nval[bin] ++;
+      dvar = (*X - mean);
+      var += dvar*dvar;
+    }      
+  } else {
+    opihi_int *X = vec[0].elements.Int;
+    for (i = 0; i < vec[0].Nelements; i++, X++) {
+      if (!finite (*X)) continue;
+      if (Ignore && (*X == IgnoreValue)) continue;
+      bin = MAX (0, MIN (1000, (*X - min) / dx));
+      Nval[bin] ++;
+      dvar = (*X - mean);
+      var += dvar*dvar;
+    }      
+  }
   stdev = sqrt (var / N);