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

Timestamp:

Nov 10, 2020, 1:25:05 PM (6 years ago)

Author:

eugene

Message:

adding 2d gaussian moment stats

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• imconvolve.c (added)
• init.c (modified) (2 diffs)
• read_vectors.c (modified) (1 diff)

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

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

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

@@ -64 +64 @@
 int imsmooth_generic PROTO((int, char **));
 int imsmooth_2d      PROTO((int, char **));
+int imconvolve       PROTO((int, char **));
 int integrate        PROTO((int, char **));
 int interpolate      PROTO((int, char **));
@@ -264 +265 @@
   {1, "imsmooth.generic", imsmooth_generic, "circular non-gaussian smoothing"},
   {1, "imsmooth.2d",  imsmooth_2d,      "circular non-gaussian smoothing"},
+  {1, "imconvolve",   imconvolve,       "full 2D real-space convolution"},
   {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

@@ -711 +711 @@
       if (!gfits_get_bintable_column_raw (outheader, outtable, argv[i], &data, IsCompressed)) ESCAPE ("error reading data from specified field\n");
     } else {
-      if (!gfits_get_table_column_type (outheader, argv[i], type)) ESCAPE ("requested field not found\n");
+      if (!gfits_get_table_column_type (outheader, argv[i], type, &Nval)) ESCAPE ("requested field not found\n");
       if (!gfits_get_table_column (outheader, outtable, argv[i], &data)) ESCAPE ("error reading data from specified field\n");
     }