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

Timestamp:

Feb 6, 2014, 12:43:34 PM (12 years ago)

Author:

eugene

Message:

fix cast in vgauss; add cast function; add psf smoothing options to densify and cdensify; add floor, ceil, rint functions to opihi math; add cdensify function; add fitpm function

Location:

trunk/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• cmd.data (modified) (1 prop)
• cmd.data/Makefile (modified) (1 diff)
• cmd.data/cast.c (copied) (copied from branches/eam_branches/ipp-20131211/Ohana/src/opihi/cmd.data/cast.c )
• cmd.data/densify.c (modified) (5 diffs)
• cmd.data/init.c (modified) (2 diffs)
• cmd.data/vgauss.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -25 +25 @@
 $(SRC)/book.$(ARCH).o           \
 $(SRC)/book_commands.$(ARCH).o  \
+$(SRC)/cast.$(ARCH).o           \
 $(SRC)/center.$(ARCH).o \
 $(SRC)/clear.$(ARCH).o          \

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

@@ -2 +2 @@
 
 # define CHECKVAL(ARG) if (!isfinite(ARG)) { gprint (GP_ERR, "illegal value for %s: %f\n", #ARG, ARG); return (FALSE); }
+enum {IS_DOT, IS_SQUARE, IS_CIRCLE, IS_GAUSS};
 
 int densify (int argc, char **argv) {
 
-  int i, Nx, Ny, Xb, Yb, N, Xpix, Ypix, good, UseGraph;
+  int i, Nx, Ny, Xb, Yb, ix, iy, N, Xpix, Ypix, good, UseGraph;
   double Xmin, Xmax, dX, Ymin, Ymax, dY;
   float *val;
@@ -24 +25 @@
   }
 
+  float scale = 0.0;
+  if ((N = get_argument (argc, argv, "-scale"))) {
+    remove_argument (N, &argc, argv);
+    scale = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  int PSFTYPE = IS_DOT;
+  if ((N = get_argument (argc, argv, "-psf"))) {
+    remove_argument (N, &argc, argv);
+    if (!strcasecmp(argv[N], "dot"))    PSFTYPE = IS_DOT;
+    if (!strcasecmp(argv[N], "square")) PSFTYPE = IS_SQUARE;
+    if (!strcasecmp(argv[N], "circle")) PSFTYPE = IS_CIRCLE;
+    if (!strcasecmp(argv[N], "gauss"))  PSFTYPE = IS_GAUSS;
+    remove_argument (N, &argc, argv);
+  }
+
   good = UseGraph ? (argc == 4) : (argc == 10);
   if (!good) {
     gprint (GP_ERR, "USAGE: densify buffer x y Xmin Xmax dX Ymin Ymax dY\n");
     gprint (GP_ERR, "   OR: densify buffer x y -graph\n");
+    gprint (GP_ERR, " option: -psf [dot] (circle) (square) (gauss)\n");
     return (FALSE);
   }
@@ -69 +88 @@
   CHECKVAL(dY);
 
+  float scaleX = (scale > 0.0) ? scale / dX : 3.0;
+  float scaleY = (scale > 0.0) ? scale / dY : 3.0;
+
   Nx = (Xmax - Xmin) / dX + 1;
   Ny = (Ymax - Ymin) / dY + 1;
@@ -76 +98 @@
   CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
   strcpy (bf[0].file, "(empty)");
+  
+  float scale2 = (scaleX + 1.0) * (scaleY + 1.0);
+  float fSquare = 1.0 / scale2;
+  float fCircle = 1.0 / (3.141592 * scale2);
+  float fSigma  = 0.5 / scale2;
+  float fGauss  = 1.0 / (2.0 * 3.141592 * scale2);
 
   x = vx[0].elements.Flt;
@@ -83 +111 @@
     Xb = (*x - Xmin) / dX;
     Yb = (*y - Ymin) / dY;
-    if (Xb >= Nx) continue;
-    if (Yb >= Ny) continue;
-    if (Xb < 0) continue;
-    if (Yb < 0) continue;
-    val[Xb + Yb*Nx] ++;
+    switch (PSFTYPE) {
+      case IS_DOT:
+        if (Xb >= Nx) continue;
+        if (Yb >= Ny) continue;
+        if (Xb < 0) continue;
+        if (Yb < 0) continue;
+        val[Xb + Yb*Nx] ++;
+        break;
+      case IS_SQUARE:
+        for (ix = Xb - scaleX; ix <= Xb + scaleX; ix++) {
+          for (iy = Yb - scaleY; iy <= Yb + scaleY; iy++) {
+            if (ix >= Nx) continue;
+            if (iy >= Ny) continue;
+            if (ix < 0) continue;
+            if (iy < 0) continue;
+            val[ix + iy*Nx] += fSquare;
+          }
+        }
+        break;
+      case IS_CIRCLE:
+        for (ix = Xb - scaleX; ix <= Xb + scaleX; ix++) {
+          float dX = ix - Xb;
+          for (iy = Yb - scaleY; iy <= Yb + scaleY; iy++) {
+            float dY = iy - Yb;
+            float r2 = dX*dX + dY*dY;
+            if (r2 > 9) continue;
+            if (ix >= Nx) continue;
+            if (iy >= Ny) continue;
+            if (ix < 0) continue;
+            if (iy < 0) continue;
+            val[ix + iy*Nx] += fCircle;
+          }
+        }
+        break;
+      case IS_GAUSS:
+        for (ix = Xb - scaleX; ix <= Xb + scaleX; ix++) {
+          float dX = ix - Xb;
+          for (iy = Yb - scaleY; iy <= Yb + scaleY; iy++) {
+            float dY = iy - Yb;
+            float r2 = dX*dX + dY*dY;
+            if (ix >= Nx) continue;
+            if (iy >= Ny) continue;
+            if (ix < 0) continue;
+            if (iy < 0) continue;
+            val[ix + iy*Nx] += fGauss*exp(-fSigma*r2);
+          }
+        }
+        break;
+    }
   }
   return (TRUE);

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

@@ -10 +10 @@
 int center           PROTO((int, char **));
 int parity           PROTO((int, char **));
+int cast             PROTO((int, char **));
 int circstats        PROTO((int, char **));
 int clear            PROTO((int, char **));
@@ -164 +165 @@
   {1, "buffers",      list_buffers,     "list the currently allocated buffers (images)"},
   {1, "center",       center,           "center image on coords"},
+  {1, "cast",         cast,             "cast input vector to specified type"},
   {1, "circstats",    circstats,        "circular statistics"},
   {1, "clear",        clear,            "erase plot"},

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

@@ -48 +48 @@
   if ((ovec = SelectVector (argv[4], ANYVECTOR, TRUE)) == NULL) return (FALSE);
 
+  CastVector (xvec, OPIHI_FLT);
+  CastVector (yvec, OPIHI_FLT);
+
   int Nsvec = strlen(argv[3]);
 
@@ -69 +72 @@
   }
 
-  CastVector (xvec, OPIHI_FLT);
-  CastVector (yvec, OPIHI_FLT);
   CastVector (svec, OPIHI_FLT);
   // XXX Cast is failing.