Changeset 2938 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Jan 8, 2005, 2:45:18 PM (22 years ago)

Author:

eugene

Message:

minor changes

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• gridify.c (modified) (4 diffs)
• imsmooth.c (modified) (2 diffs)

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

@@ -3 +3 @@
 int gridify (int argc, char **argv) {
 
-  int i, Nx, Ny, Xb, Yb;
+  int i, Nx, Ny, Xb, Yb, Normalize, N;
   float Xmin, Xmax, dX, Ymin, Ymax, dY;
   float *buf, *val, *x, *y, *z;
@@ -9 +9 @@
   Buffer *bf;
   Vector *vx, *vy, *vz;
+
+  Normalize = TRUE;
+  if ((N = get_argument (argc, argv, "-raw"))) {
+    remove_argument (N, &argc, argv);
+    Normalize = FALSE;
+  }
 
   if (argc != 11) {
@@ -66 +72 @@
     if (Xb >= Nx) continue;
     if (Yb >= Ny) continue;
-    val[Xb + Yb*Nx] = *z;
+    val[Xb + Yb*Nx] += *z;
     Nval[Xb + Yb*Nx]++;
   }
@@ -72 +78 @@
   buf = (float *) bf[0].matrix.buffer;
   for (i = 0; i < Nx*Ny; i++) {
-    if (Nval[i] == 0) {
-      buf[i] = 0;
-      continue;
+    if (Normalize) {
+      if (Nval[i] == 0) {
+        buf[i] = 0;
+        continue;
+      }
+      buf[i] = val[i] / Nval[i];
+    } else {
+      buf[i] = val[i];
     }
-    buf[i] = val[i] / Nval[i];
   }
 

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

@@ -1 +1 @@
 # include "data.h"
-# define NSIGMA 3
 
 int imsmooth (int argc, char **argv) {
   
-  int i, j, n, Nx, Ny, Ns, Ngauss;
+  int i, j, n, N, Nx, Ny, Ns, Ngauss;
   float *vi, *vo, *gauss, *gaussnorm;
-  float g, s, sigma;
+  float g, s, sigma, Nsigma;
   Buffer *in;
   float *temp;
+
+  Nsigma = 3;
+  if ((N = get_argument (argc, argv, "-Nsigma"))) {
+    remove_argument (N, &argc, argv);
+    Nsigma = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
 
   if (argc != 3) {
@@ -23 +29 @@
 
   /* build a 1D gaussian */
-  Ns = (int) (NSIGMA*sigma + 0.5);
+  Ns = (int) (Nsigma*sigma + 0.5);
   Ngauss = 2*Ns + 1;
   ALLOCATE (gaussnorm, float, Ngauss);