Changeset 42946

Timestamp:

Nov 23, 2025, 4:33:16 PM (8 months ago)

Author:

eugene

Message:

add spline option to extrapolate (vs saturate); add vweave function (like drizzle for a vector)

Location:

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi

Files:

• cmd.data/Makefile (modified) (1 diff)
• cmd.data/init.c (modified) (2 diffs)
• cmd.data/spline_commands.c (modified) (1 diff)
• cmd.data/test/spline.sh (modified) (2 diffs)
• cmd.data/vweave.c (added)
• include/data.h (modified) (2 diffs)
• lib.data/spline.c (modified) (3 diffs)

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi/cmd.data/Makefile

@@ -183 +183 @@
 $(SRC)/vbin.$(ARCH).o              \
 $(SRC)/vgroup.$(ARCH).o            \
+$(SRC)/vweave.$(ARCH).o            \
 $(SRC)/vclip.$(ARCH).o             \
 $(SRC)/vgauss.$(ARCH).o            \

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi/cmd.data/init.c

@@ -168 +168 @@
 int vbin             PROTO((int, char **));
 int vgroup           PROTO((int, char **));
+int vweave           PROTO((int, char **));
 int vclip            PROTO((int, char **));
 int vect_select      PROTO((int, char **));
@@ -382 +383 @@
   {1, "vbin",         vbin,             "rebin vector data by a factor of N"},
   {1, "vgroup",       vgroup,           "group y vector into bins defined by x vector values"},
+  {1, "vweave",       vweave,           "drizzle input vectors to output vector with correct fractional bin weighting"},
   {1, "vclip",        vclip,            "clip values in a vector to be within a range"},
   {1, "vectors",      list_vectors,     "list vectors"},

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi/cmd.data/spline_commands.c

@@ -62 +62 @@
 int spline_apply (int argc, char **argv) {
 
-  int i;
+  int i, N;
   Vector *xvec, *yvec;
+
+  spline_contruct_mode (SPLINE_SATURATE);
+  if ((N = get_argument (argc, argv, "-extrapolate"))) {
+    spline_contruct_mode (SPLINE_EXTRAPOLATE);
+    remove_argument (N, &argc, argv);
+  }
 
   if (argc != 4) {

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi/cmd.data/test/spline.sh

@@ -1 +1 @@
 
 macro test1
-
   for i 0 100
     create x 0 50
@@ -10 +9 @@
   end
 end
+
+macro mytest.saturate
+  vlist x 400 500  600  700  800  900
+  vlist y  15 425  610  700  745  775
+
+  spline create t1 x y
+
+  create X 300 1000 5
+  spline apply t1 X Y
+
+  lim X Y; clear; box; plot x y; plot -c red -x line X Y
+end
+ 
+macro mytest.extrapolate
+  vlist x 400 500  600  700  800  900
+  vlist y  15 425  610  700  745  775
+
+  spline create t1 x y
+
+  create X 300 1000 5
+  spline apply t1 X Y -extrapolate
+
+  lim X Y; clear; box; plot x y; plot -c red -x line X Y
+end
+ 

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi/include/data.h

@@ -33 +33 @@
   char **pageIDs;
 } Book;
+
+typedef enum {SPLINE_SATURATE, SPLINE_EXTRAPOLATE} SplineMode;
 
 // the interpolating spline has valu
@@ -138 +140 @@
 void spline_construct_dbl (opihi_flt *x, opihi_flt *y, int N, opihi_flt *y2, opihi_flt dyLower, opihi_flt dyUpper);
 opihi_flt spline_apply_dbl (opihi_flt *x, opihi_flt *y, opihi_flt *y2, int N, opihi_flt X);
+int spline_contruct_mode (SplineMode mode);
 
 /* in svdcmp.c */

branches/eam_branches/ipp-ppmerge-20241229/Ohana/src/opihi/lib.data/spline.c

@@ -1 +1 @@
 # include "data.h"
+
+static SplineMode MODE = SPLINE_SATURATE; // SATURATE or EXTRAPOLATE?
+
+int spline_contruct_mode (SplineMode mode) {
+  
+  switch (mode) {
+  case SPLINE_SATURATE:
+  case SPLINE_EXTRAPOLATE:
+    MODE = mode;
+    break;
+  default:
+    return FALSE;
+  }
+  return TRUE;
+}
 
 /* construct the natural spline for x, y in y2 */
@@ -36 +51 @@
   
   // saturate correction at high and low ends
-  if (X < x[0]) return y[0];
-  if (X > x[N-1]) return y[N-1];
+  if (MODE == SPLINE_SATURATE) {
+    if (X < x[0]) return y[0];
+    if (X > x[N-1]) return y[N-1];
+  }
 
   /* find correct element in array (x must be sorted) */
@@ -114 +131 @@
   
   // saturate correction at high and low ends
-  if (X < x[0]) return y[0];
-  if (X > x[N-1]) return y[N-1];
+  if (MODE == SPLINE_SATURATE) {
+    if (X < x[0]) return y[0];
+    if (X > x[N-1]) return y[N-1];
+  }
 
   /* find correct element in array (x must be sorted) */