Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/vsmooth.c

Timestamp:

Nov 30, 2008, 7:45:21 AM (18 years ago)

Author:

eugene

Message:

modify functions to use both int and flt vectors

File:

• branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/vsmooth.c (modified) (5 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/vsmooth.c

@@ -3 +3 @@
 int vsmooth (int argc, char **argv) {
   
-  int i, n, N, Nx, Ns, Ngauss;
-  opihi_flt *vi, *vo, *gauss, *gaussnorm;
-  float g, s, sigma, Nsigma;
+  int i, n, N, Nx, Ns, Ngauss, isFloat;
+  opihi_flt *vf, *vo, *gauss, *gaussnorm;
+  opihi_int *vi;
+  float g, s, sigma, Nsigma, value;
   Vector *in;
 
@@ -23 +24 @@
   sigma = atof (argv[2]);
   Nx = in[0].Nelements;
-  vi = in[0].elements.Flt;
 
   /* build a 1D gaussian */
@@ -36 +36 @@
   ALLOCATE (vo, opihi_flt, Nx);
 
+  isFloat = (in[0].type == OPIHI_FLT);
+  vf = in[0].elements.Flt;
+  vi = in[0].elements.Int;
+
   for (i = 0; i < Nx; i++) {
     g = s = 0;
@@ -41 +45 @@
       if (i+n < 0) continue;
       if (i+n >= Nx) continue;
-      s += gauss[n]*vi[i+n];
+      value = isFloat ? vf[i+n] : vi[i+n];
+      s += gauss[n]*value;
       g += gauss[n];
     }
@@ -47 +52 @@
   }
 
-  free (in[0].elements.Flt);
   free (gaussnorm);
 
+  if (isFloat) {
+    free (in[0].elements.Flt);
+  } else {
+    free (in[0].elements.Int);
+  }
+
+  // smoothing an int vector results in a float vector
+  in[0].type = OPIHI_FLT;
   in[0].elements.Flt = vo;
   return (TRUE);