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

Timestamp:

Dec 10, 2013, 2:55:11 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)
• Ohana/src/opihi/cmd.data/Makefile (modified) (1 diff)
• Ohana/src/opihi/cmd.data/imsmooth.2d.c (copied) (copied from branches/eam_branches/ipp-20130904/Ohana/src/opihi/cmd.data/imsmooth.2d.c )
• Ohana/src/opihi/cmd.data/imsmooth.generic.c (copied) (copied from branches/eam_branches/ipp-20130904/Ohana/src/opihi/cmd.data/imsmooth.generic.c )
• Ohana/src/opihi/cmd.data/init.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.data/read_vectors.c (modified) (3 diffs)

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

@@ -64 +64 @@
 $(SRC)/imhist.$(ARCH).o \
 $(SRC)/imsmooth.$(ARCH).o       \
+$(SRC)/imsmooth.generic.$(ARCH).o       \
+$(SRC)/imsmooth.2d.$(ARCH).o    \
 $(SRC)/integrate.$(ARCH).o      \
 $(SRC)/interpolate.$(ARCH).o    \

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

@@ -53 +53 @@
 int imhist           PROTO((int, char **));
 int imsmooth         PROTO((int, char **));
+int imsmooth_generic PROTO((int, char **));
+int imsmooth_2d      PROTO((int, char **));
 int integrate        PROTO((int, char **));
 int interpolate      PROTO((int, char **));
@@ -208 +210 @@
   {1, "imhistogram",  imhist,           "histogram of an image region"},
   {1, "imsmooth",     imsmooth,         "circular gaussian smoothing"},
+  {1, "imsmooth.generic", imsmooth_generic, "circular non-gaussian smoothing"},
+  {1, "imsmooth.2d",  imsmooth_2d,      "circular non-gaussian smoothing"},
   {1, "imstats",      imstats,          "statistics on a portion of an image"},
   {1, "integrate",    integrate,        "integrate a vector"},

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

@@ -23 +23 @@
 // vector types
 enum {COLTYPE_NONE, COLTYPE_FLT, COLTYPE_INT, COLTYPE_TIME, COLTYPE_CHAR};
+static int FITS_TRANSPOSE;
 
 int read_vectors (int argc, char **argv) {
@@ -34 +35 @@
 
   char *buffer = NULL;
+
+  FITS_TRANSPOSE = FALSE;
+  if ((Narg = get_argument (argc, argv, "-transpose"))) {
+    remove_argument (Narg, &argc, argv);
+    FITS_TRANSPOSE = TRUE;
+  }
 
   /* auto-sense table type */
@@ -410 +417 @@
     }
         
-    // define the multifield vector names
-    ALLOCATE (vec, Vector *, Nval);
-    for (j = 0; j < Nval; j++) {
-      if (Nval == 1) 
-        sprintf (name, "%s", argv[i]);
-      else
-        sprintf (name, "%s:%d", argv[i], j);
-      if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
-      ResetVector (vec[j], vecType, Ny);
-    }
-
-    if (!strcmp (type, "char")) {
-      char *Ptr = data;
+    if (!FITS_TRANSPOSE) {
+      // define the multifield vector names (Nval vectors x Ny elements)
+      ALLOCATE (vec, Vector *, Nval);
+      for (j = 0; j < Nval; j++) {
+        if (Nval == 1) 
+          sprintf (name, "%s", argv[i]);
+        else
+          sprintf (name, "%s:%d", argv[i], j);
+        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
+        ResetVector (vec[j], vecType, Ny);
+      }
+
+      if (!strcmp (type, "char")) {
+        char *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[k][0].elements.Int[j] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "short")) {
+        short *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[k][0].elements.Int[j] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "int")) {
+        int *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[k][0].elements.Int[j] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "int64_t")) {
+        int64_t *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[k][0].elements.Int[j] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "float")) {
+        float *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[k][0].elements.Flt[j] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "double")) {
+        double *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[k][0].elements.Flt[j] = *Ptr;
+          }
+        }
+      }
+    } else {
+      // define the multifield vector names (Ny vectors x Nval elements)
+      ALLOCATE (vec, Vector *, Ny);
       for (j = 0; j < Ny; j++) {
-        for (k = 0; k < Nval; k++, Ptr++) {
-          vec[k][0].elements.Int[j] = *Ptr;
-        }
-      }
-    }
-    if (!strcmp (type, "short")) {
-      short *Ptr = data;
-      for (j = 0; j < Ny; j++) {
-        for (k = 0; k < Nval; k++, Ptr++) {
-          vec[k][0].elements.Int[j] = *Ptr;
-        }
-      }
-    }
-    if (!strcmp (type, "int")) {
-      int *Ptr = data;
-      for (j = 0; j < Ny; j++) {
-        for (k = 0; k < Nval; k++, Ptr++) {
-          vec[k][0].elements.Int[j] = *Ptr;
-        }
-      }
-    }
-    if (!strcmp (type, "int64_t")) {
-      int64_t *Ptr = data;
-      for (j = 0; j < Ny; j++) {
-        for (k = 0; k < Nval; k++, Ptr++) {
-          vec[k][0].elements.Int[j] = *Ptr;
-        }
-      }
-    }
-    if (!strcmp (type, "float")) {
-      float *Ptr = data;
-      for (j = 0; j < Ny; j++) {
-        for (k = 0; k < Nval; k++, Ptr++) {
-          vec[k][0].elements.Flt[j] = *Ptr;
-        }
-      }
-    }
-    if (!strcmp (type, "double")) {
-      double *Ptr = data;
-      for (j = 0; j < Ny; j++) {
-        for (k = 0; k < Nval; k++, Ptr++) {
-          vec[k][0].elements.Flt[j] = *Ptr;
+        if (Ny == 1) 
+          sprintf (name, "%s", argv[i]);
+        else
+          sprintf (name, "%s:%d", argv[i], j);
+        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
+        ResetVector (vec[j], vecType, Nval);
+      }
+
+      if (!strcmp (type, "char")) {
+        char *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[j][0].elements.Int[k] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "short")) {
+        short *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[j][0].elements.Int[k] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "int")) {
+        int *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[j][0].elements.Int[k] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "int64_t")) {
+        int64_t *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[j][0].elements.Int[k] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "float")) {
+        float *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[j][0].elements.Flt[k] = *Ptr;
+          }
+        }
+      }
+      if (!strcmp (type, "double")) {
+        double *Ptr = data;
+        for (j = 0; j < Ny; j++) {
+          for (k = 0; k < Nval; k++, Ptr++) {
+            vec[j][0].elements.Flt[k] = *Ptr;
+          }
         }
       }