Changeset 40642 for trunk/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Mar 18, 2019, 5:02:59 PM (7 years ago)

Author:

eugene

Message:

cleanup opihi sort functions; add deimos fitobj function

File:

• trunk/Ohana/src/opihi/dvo/gstar.c (modified) (2 diffs)

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

@@ -71 +71 @@
 void printPhotcodeSequence (Average *average, SecFilt *secfilt, int entry, int type);
 
-void sort_index_float (float *X, int *IDX, int N) {
-
-# define SWAPFUNC(A,B){ float tmp; int itmp;            \
-    tmp = X[A]; X[A] = X[B]; X[B] = tmp;                \
-    itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp;      \
-  }
-# define COMPARE(A,B)(X[A] < X[B])
-
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
-
-# undef SWAPFUNC
-# undef COMPARE
-
-}
-
 int gstar (int argc, char **argv) {
   
@@ -712 +697 @@
         }
 
-        sort_index_float (value, index, catalog.average[k].Nmeasure);
+        sort_float_index (value, index, catalog.average[k].Nmeasure);
 
         for (j = 0; j < catalog.average[k].Nmeasure; j++, m++) {