Changeset 26891 for trunk/Ohana/src/opihi

Timestamp:

Feb 10, 2010, 7:24:46 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/mkgauss.c (modified) (2 diffs)
• cmd.astro/profile.c (modified) (1 diff)
• cmd.astro/star.c (modified) (1 diff)
• cmd.basic/Makefile (modified) (1 diff)
• cmd.basic/init.c (modified) (3 diffs)
• cmd.basic/nop.c (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/cmd.basic/nop.c )
• cmd.data/Makefile (modified) (2 diffs)
• cmd.data/hermitian1d.c (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/cmd.data/hermitian1d.c )
• cmd.data/hermitian2d.c (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/cmd.data/hermitian2d.c )
• cmd.data/init.c (modified) (4 diffs)
• cmd.data/matrix.c (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/cmd.data/matrix.c )
• cmd.data/svd.c (modified) (1 diff)
• cmd.data/test/matrix.sh (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/cmd.data/test/matrix.sh )
• cmd.data/test/svd.sh (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/cmd.data/test/svd.sh )
• doc/svdcmp_eispack.f (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/doc/svdcmp_eispack.f )
• include/data.h (modified) (2 diffs)
• include/pclient.h (modified) (1 diff)
• lib.data/Makefile (modified) (2 diffs)
• lib.data/hermitian.c (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/lib.data/hermitian.c )
• lib.data/svdcmp_bond_raw.c (copied) (copied from branches/eam_branches/20091201/Ohana/src/opihi/lib.data/svdcmp_bond_raw.c )
• lib.shell/stack_math.c (modified) (4 diffs)
• pclient/ChildOps.c (modified) (3 diffs)
• pclient/pclient.c.in (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.astro/mkgauss.c

@@ -11 +11 @@
   Buffer *buf;
 
-  Xo = Yo = 0;
+  // this should be Nx/2, Ny/2 if not set
+  Xo = Yo = NAN;
   if ((N = get_argument (argc, argv, "-c"))) {
     remove_argument (N, &argc, argv);
@@ -30 +31 @@
   Ny = buf[0].header.Naxis[1];
   
+  if (isnan(Xo)) Xo = Nx / 2;
+  if (isnan(Yo)) Yo = Ny / 2;
+
   /* gaussian parameters */
   Sig_x = atof (argv[2]);

trunk/Ohana/src/opihi/cmd.astro/profile.c

@@ -31 +31 @@
   ResetVector (yvec, OPIHI_FLT, (int)SQ(2*N+1));
 
-  bzero (yvec[0].elements.Flt, (int)SQ(2*N+1)*sizeof(opihi_flt)+1);
+  bzero (yvec[0].elements.Flt, (int)SQ(2*N+1)*sizeof(opihi_flt));
   V = (float *)(buf[0].matrix.buffer); 
   Npt = 0;
   Nx = buf[0].matrix.Naxis[0];
-  for (i = sx - N; i < sx + N; i++) {
-    for (j = sy - N; j < sy + N; j++, Npt++) {
+  for (i = sx - N; i <= sx + N; i++) {
+    for (j = sy - N; j <= sy + N; j++, Npt++) {
       yvec[0].elements.Flt[Npt] = V[i + j*Nx];
-      xvec[0].elements.Flt[Npt] = hypot (i - sx, j - sy);
+      xvec[0].elements.Flt[Npt] = hypot (i + 0.5 - sx, j + 0.5 - sy);
     }
   }

trunk/Ohana/src/opihi/cmd.astro/star.c

@@ -24 +24 @@
   if ((argc != 4) && (argc != 5)) {
     gprint (GP_ERR, "USAGE: star (buffer) x y [dx] [-border N] [-sat cnts]\n");
+    gprint (GP_ERR, " dx is the aperture diameter, but is adjusted up to the next odd number\n");
     return (FALSE);
   }

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

@@ -39 +39 @@
 $(SRC)/mkdir.$(ARCH).o     \
 $(SRC)/module.$(ARCH).o     \
+$(SRC)/nop.$(ARCH).o        \
 $(SRC)/output.$(ARCH).o     \
 $(SRC)/quit.$(ARCH).o        \

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

@@ -25 +25 @@
 int mkdir_opihi     PROTO((int, char **));
 int module          PROTO((int, char **));
+int nop             PROTO((int, char **));
 int output          PROTO((int, char **));
 int pwd             PROTO((int, char **));
@@ -66 +67 @@
   {1, "?",             list_help,          "list commands *"},
   {1, "??",            list_vars,          "list variables *"},
+  {1, "#",             nop,                "a NOP function"},
   {1, "local",         local,              "define local variables"},
   {1, "macro",         macro,              "deal with the macros *"}, 
@@ -71 +73 @@
   {1, "mkdir",         mkdir_opihi,        "built-in mkdir command"},
   {1, "module",        module,             "load script file from the modules directories"},
+  {1, "nop",           nop,                "a NOP function"},
   {1, "output",        output,             "redirect output to file"},
   {1, "pwd",           pwd,                "print current working directory"},

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

@@ -53 +53 @@
 $(SRC)/ungridify.$(ARCH).o     \
 $(SRC)/histogram.$(ARCH).o      \
+$(SRC)/hermitian1d.$(ARCH).o    \
+$(SRC)/hermitian2d.$(ARCH).o    \
 $(SRC)/imcut.$(ARCH).o          \
 $(SRC)/imhist.$(ARCH).o \
@@ -69 +71 @@
 $(SRC)/load.$(ARCH).o           \
 $(SRC)/lookup.$(ARCH).o \
+$(SRC)/matrix.$(ARCH).o \
 $(SRC)/mkrgb.$(ARCH).o  \
 $(SRC)/mcreate.$(ARCH).o        \

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

@@ -42 +42 @@
 int ungridify        PROTO((int, char **));
 int histogram        PROTO((int, char **));
+int hermitian1d      PROTO((int, char **));
+int hermitian2d      PROTO((int, char **));
 int imcut            PROTO((int, char **));
 int imhist           PROTO((int, char **));
@@ -58 +60 @@
 int load             PROTO((int, char **));
 int lookup           PROTO((int, char **));
+int matrix           PROTO((int, char **));
 int mkrgb            PROTO((int, char **));
 int mcreate          PROTO((int, char **));
@@ -172 +175 @@
   {1, "header",       header,           "print image header"},
   {1, "histogram",    histogram,        "generate histogram from vector"},
+  {1, "hermitian1d",  hermitian1d,      "generate 1-D Hermitian Polynomial"},
+  {1, "hermitian2d",  hermitian2d,      "generate 2-D Hermitian Polynomial"},
   {1, "imbin",        rebin,            "rebin image data by factor of N"},
   {1, "imclip",       imclip,           "clip values in an image to be within a range"},
@@ -195 +200 @@
   {1, "minterp",      minterp,          "interpolate image pixels"},
   {1, "iminterp",     minterp,          "interpolate image pixels"},
+  {1, "matrix",       matrix,           "matrix math operations"},
   {1, "mkrgb",        mkrgb,            "convert 3 images to rgb jpeg (use Kapa for better control)"},
   {1, "mset",         mset,             "insert a vector in an image"},

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

@@ -57 +57 @@
   /* use a bcopy instead? */
 
+  // try C.R. Bond's version -- requires matrices in the form A[row][col] not A[row*Ncol + col]
+  if (1) { 
+      int j;
+      double **a, **u, **v, *q;
+      ALLOCATE (a, double *, Ny);
+      ALLOCATE (u, double *, Ny);
+      ALLOCATE (v, double *, Ny);
+      for (i = 0; i < Ny; i++) {
+          ALLOCATE (a[i], double, Nx);
+          ALLOCATE (u[i], double, Nx);
+          ALLOCATE (v[i], double, Nx);
+      }   
+      ALLOCATE (q, double, Nx);
+
+      for (j = 0; j < Ny; j++) {
+          for (i = 0; i < Nx; i++) {
+              a[j][i] = A[j*Nx + i];
+              u[j][i] = 0;
+              v[j][i] = 0;
+          }
+      }
+      for (i = 0; i < Nx; i++) {
+          q[i] = 0;
+      }
+
+      status = svdcmp_bond_raw (Ny, Nx, 1, 1, FLT_EPSILON, 1e-6, a, q, u, v);
+      fprintf (stderr, "status: %d\n", status);
+
+      // copy u q v back to U W V:
+      for (j = 0; j < Ny; j++) {
+          for (i = 0; i < Nx; i++) {
+              U[j*Nx + i] = u[j][i];
+              V[j*Nx + i] = v[j][i];
+          }
+      }
+      for (i = 0; i < Nx; i++) {
+          W[i] = q[i];
+      }
+
+      for (j = 0; j < Ny; j++) {
+          free(a[j]);
+          free(u[j]);
+          free(v[j]);
+      }
+      free (a);
+      free (u);
+      free (v);
+      free (q);
+
+      return TRUE;
+  }
+
   status = svdcmp (U, W, V, Nx, Ny);
   if (!status) {

trunk/Ohana/src/opihi/include/data.h

@@ -89 +89 @@
 int svdcmp (float *a, opihi_flt *w, float *v, int Nx, int Ny);
 
+/* in svdcmp_bond_raw.c */
+int svdcmp_bond_raw(int m, int n, int withu, int withv, double eps, double tol, double **a, double *q, double **u, double **v);
+
 /* mrqmin.c */
 opihi_flt mrqcof (opihi_flt *x, opihi_flt *y, opihi_flt *dy, int Npts, 
@@ -162 +165 @@
 void FreeBooks (void);
 
+/* hermitian functions */
+double hermitian_polynomial (double x, int order);
+double hermitian_00(double x);
+double hermitian_01(double x);
+double hermitian_02(double x);
+double hermitian_03(double x);
+double hermitian_04(double x);
+double hermitian_05(double x);
+double hermitian_06(double x);
+double hermitian_07(double x);
+double hermitian_08(double x);
+double hermitian_09(double x);
+double hermitian_10(double x);
+
 # endif

trunk/Ohana/src/opihi/include/pclient.h

@@ -52 +52 @@
 void FreePclient (void);
 void gotsignal (int signum);
+void pipe_signal (int signum);
+void pipe_signal_clear(void);
 
 # define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))

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

@@ -20 +20 @@
 $(SDIR)/fft.$(ARCH).o                   \
 $(SDIR)/svdcmp.$(ARCH).o                \
+$(SDIR)/svdcmp_bond_raw.$(ARCH).o               \
 $(SDIR)/convert.$(ARCH).o               \
 $(SDIR)/bracket.$(ARCH).o               \
@@ -27 +28 @@
 $(SDIR)/precess.$(ARCH).o               \
 $(SDIR)/starfuncs.$(ARCH).o             \
+$(SDIR)/hermitian.$(ARCH).o             \
 $(SDIR)/gaussian.$(ARCH).o              \
 $(SDIR)/graphtools.$(ARCH).o            \

trunk/Ohana/src/opihi/lib.shell/stack_math.c

@@ -628 +628 @@
 
 # define MS_FUNC(OP) {                                  \
-    if (V2->type == 's')  {                             \
+    if (V2->type == 'S')  {                             \
       opihi_flt M2 = V2[0].FltValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M1++) {        \
@@ -635 +635 @@
       break;                                            \
     }                                                   \
-    if (V2->type == 'S')  {                             \
+    if (V2->type == 's')  {                             \
       opihi_int M2 = V2[0].IntValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M1++) {        \
@@ -704 +704 @@
 
 # define SM_FUNC(OP) {                                  \
-    if (V1->type == 's')  {                             \
+    if (V1->type == 'S')  {                             \
       opihi_flt M1 = V1[0].FltValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M2++) {        \
@@ -711 +711 @@
       break;                                            \
     }                                                   \
-    if (V1->type == 'S')  {                             \
+    if (V1->type == 's')  {                             \
       opihi_int M1 = V1[0].IntValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M2++) {        \

trunk/Ohana/src/opihi/pclient/ChildOps.c

@@ -1 +1 @@
 # include "pclient.h"
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <unistd.h>
+# include <sys/ioctl.h>
+# include <sys/types.h>
+# include <unistd.h>
 // #include <stropts.h>
 
@@ -67 +67 @@
     case 0:   /* pipe is closed */
       /** change child state? **/
+      pipe_signal_clear();
       break;
     default:  /* data in pipe */
@@ -81 +82 @@
     case 0:   /* pipe is closed */
       /** change child state? **/
+      pipe_signal_clear();
       break;
     default:  /* data in pipe */

trunk/Ohana/src/opihi/pclient/pclient.c.in

@@ -46 +46 @@
 
   /* ignore the history file.  to change this, see, eg, mana.c */
-  signal (SIGPIPE, gotsignal);
+
+  /* We do not want pclient to exit just because the connection to the 
+     child process is broken.  However, if the connection to the parent 
+     process is broken, we should exit.  To handle this, we define 
+     pipe_signal() which tracks the number of times it has been called.
+     Every time an I/O operation on the child file descriptor raises this signal, 
+     we need to manage the crashed child and then clear the count.  Signals raised by 
+     I/O to the parent do not result in clearing the count.  If the count passes a maximum,
+     we exit pclient */
+     
+  signal (SIGPIPE, pipe_signal);
   signal (SIGTSTP, gotsignal);
   signal (SIGTTIN, gotsignal);
@@ -67 +77 @@
 }
 
+static int Npipe = 0;
+
+void pipe_signal (int signum) {
+  Npipe ++;
+  if (Npipe > 100) {
+    exit (5);
+  }
+  gprint (GP_ERR, "closed pipe : did child process exit unexpectedly?\n");
+  return;
+}
+
+void pipe_signal_clear(void) {
+  Npipe = 0;
+}
+
 void gotsignal (int signum) {
   gprint (GP_ERR, "got signal : %d\n", signum);