Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/vsmooth.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/vsmooth.c (modified) (5 diffs)

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

@@ -3 +3 @@
 int vsmooth (int argc, char **argv) {
   
-  int i, n, N, Nx, Ns, Ngauss;
-  float *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;
 
   /* build a 1D gaussian */
   Ns = (int) (Nsigma*sigma + 0.5);
   Ngauss = 2*Ns + 1;
-  ALLOCATE (gaussnorm, float, Ngauss);
+  ALLOCATE (gaussnorm, opihi_flt, Ngauss);
   gauss = &gaussnorm[Ns];
   for (i = -Ns; i < Ns + 1; i++) {
@@ -34 +34 @@
   }
 
-  ALLOCATE (vo, float, Nx);
+  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++) {
@@ -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);
   free (gaussnorm);
 
-  in[0].elements = vo;
+  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);
 }