Changeset 15274

Timestamp:

Oct 9, 2007, 7:06:35 PM (19 years ago)

Author:

eugene

Message:

moved bracket to lib.data, working on new image stats function

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/stats-new.c (added)
• dvo/subpix.c (modified) (3 diffs)
• include/data.h (modified) (1 diff)
• lib.data/Makefile (modified) (1 diff)
• lib.data/bracket.c (added)

trunk/Ohana/src/opihi/dvo/subpix.c

@@ -1 +1 @@
 # include "dvoshell.h"
-
-int bracket (double *list, double value, int Nlist, int mode);
 
 int subpix (int argc, char **argv) {
@@ -65 +63 @@
 
   /* bracket the DEC range of interest */
-  Nlo = bracket (DEC, Dec - Radius, Nstars, FALSE);
-  Nhi = bracket (DEC, Dec + Radius, Nstars, TRUE);
+  Nlo = bracket (DEC, Nstars, FALSE, Dec - Radius);
+  Nhi = bracket (DEC, Nstars, TRUE,  Dec + Radius);
   ALLOCATE (entry, int, MAX (Nhi - Nlo, 1));
   Nentry = 0;
@@ -155 +153 @@
   return (TRUE);
 }
-
-/* fast operation to find an entry just below (0) or above (1) value */
-int bracket (double *list, double value, int Nlist, int mode) {
-
-  int Nlo, Nhi, N;
-
-  if (mode == 0) {
-    Nlo = 0; Nhi = Nlist;
-    while (Nhi - Nlo > 10) {
-      N = 0.5*(Nlo + Nhi);
-      if (list[N] < value) {
-        Nlo = N;
-      } else {
-        Nhi = N + 1;
-      }
-    }
-    return (Nlo);
-  }
-  if (mode == 1) {
-    Nlo = 0; Nhi = Nlist;
-    while (Nhi - Nlo > 10) {
-      N = 0.5*(Nlo + Nhi);
-      if (list[N] > value) {
-        Nhi = N;
-      } else {
-        Nlo = N - 1;
-      }
-    }
-    return (Nhi);
-  }
-  return (0);
-}

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

@@ -168 +168 @@
 void *db_getConnection ();
 
+int bracket (double *list, int Nlist, int mode, double value);
+int ibracket (int *list, int Nlist, int mode, double value);
+
 # endif
 

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

@@ -22 +22 @@
 $(SDIR)/svdcmp.$(ARCH).o                \
 $(SDIR)/convert.$(ARCH).o               \
+$(SDIR)/bracket.$(ARCH).o               \
 $(SDIR)/spline.$(ARCH).o                \
 $(SDIR)/mrqmin.$(ARCH).o                \