Changeset 41340 for trunk/Ohana/src/opihi/cmd.data/interpolate_presort.c

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

• trunk/Ohana/src/opihi/cmd.data/interpolate_presort.c (modified) (3 diffs)

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

@@ -7 +7 @@
   double x0, dx, dy, y0;
   Vector *xout, *yout, *xin, *yin;
-
-  int N;
-  int FillEnds = FALSE;
-  if ((N = get_argument (argc, argv, "-fill-ends"))) {
-    FillEnds = TRUE;
-    remove_argument (N, &argc, argv);
-  }
 
   /** check basic syntax **/
@@ -43 +36 @@
   y0 = yin[0].elements.Flt[0];
   
-  // fill in the start with NANs
-  for (i = 0; (i < xout[0].Nelements) && (xout[0].elements.Flt[i] < xin[0].elements.Flt[0]); i++) {
-    yout[0].elements.Flt[i] = FillEnds ? yin[0].elements.Flt[0] : NAN;
-  }
+  /* in and out vectors are sorted */
+  j = 0;
 
   // every output pixel should get a value unless 
   // we are below the lowest in or above the highest in
-  for (j = 0; (i < xout[0].Nelements) && (j < xin[0].Nelements - 1); ) {
+  for (i = 0, j = 0; (i < xout[0].Nelements) && (j < xin[0].Nelements - 1); ) {
 
     yout[0].elements.Flt[i] = NAN;
@@ -75 +66 @@
 
   // fill in the rest with NANs
-  int NinLast = xin[0].Nelements - 1;
   while (i < yout[0].Nelements) {
-    yout[0].elements.Flt[i] = FillEnds ? yin[0].elements.Flt[NinLast] : NAN;
+    yout[0].elements.Flt[i] = NAN;
     i++;
   }
 
   return (TRUE);
+    
 }