IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16119


Ignore:
Timestamp:
Jan 17, 2008, 1:21:51 PM (18 years ago)
Author:
eugene
Message:

removing Press code

Location:
trunk/Ohana/src/opihi
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

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

    r16117 r16119  
    8787int shift            PROTO((int, char **));
    8888int sort_vectors     PROTO((int, char **));
    89 int spline_apply    PROTO((int, char **));
    90 int spline_construct PROTO((int, char **));
     89int spline_apply_cmd PROTO((int, char **));
     90int spline_construct_cmd PROTO((int, char **));
    9191int stats            PROTO((int, char **));
    9292int style            PROTO((int, char **));
    … …  
    208208  {"shift",        shift,            "shift data in an image"},
    209209  {"sort",         sort_vectors,     "sort list of vectors"},
    210   {"spline.apply", spline_apply,    "apply spline fit to generate an image"},
    211   {"spline.const", spline_construct, "create spline 2nd deriv. terms"},
     210  {"spline.apply", spline_apply_cmd, "apply spline fit to generate an image"},
     211  {"spline.const", spline_construct_cmd, "create spline 2nd deriv. terms"},
    212212  {"stats",        stats,            "give statistics on a portion of a buffer"},
    213213  {"style",        style,            "set the style for graph plots"},

  • trunk/Ohana/src/opihi/cmd.data/spline_apply.c

    r7917 r16119  
    11# include "data.h"
    22
    3 void spline (float *x, float *y, int N, float *y2);
    4 float splint (float *x, float *y, float *y2, int N, float X);
    5 
    6 int spline_apply (int argc, char **argv) {
     3// need to rename this as an image function
     4int spline_apply_cmd (int argc, char **argv) {
    75 
    86  int i, j, I, J;
    … …  
    7775        Ty2[j] = *V2;
    7876      }
    79       Tx1[i] = splint (Tyc, Ty1, Ty2, Ny, y);
     77      Tx1[i] = spline_apply (Tyc, Ty1, Ty2, Ny, y);
    8078    }
    81     spline (Txc, Tx1, Nx, Tx2);
     79    spline_construct (Txc, Tx1, Nx, Tx2);
    8280
    8381    /* apply x-dir spline to new image */
    8482    for (I = 0; I < nx; I++, V++) {
    8583      x = I * rx;
    86       *V = splint (Txc, Tx1, Tx2, Nx, x);
     84      *V = spline_apply (Txc, Tx1, Tx2, Nx, x);
    8785    }
    8886  }

  • trunk/Ohana/src/opihi/cmd.data/spline_construct.c

    r7917 r16119  
    11# include "data.h"
    22
    3 int spline_construct (int argc, char **argv) {
     3// need to rename this as an image function
     4int spline_construct_cmd (int argc, char **argv) {
    45 
    56  int i, j, Nx, Ny, xdir;
    … …  
    5455    }
    5556 
    56     spline (Tx, Ty, Ny, Ty2);
     57    spline_construct (Tx, Ty, Ny, Ty2);
    5758 
    5859    /* copy derivatives to output buffer */

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

    r16117 r16119  
    7373int PrintQueue (Queue *queue);
    7474
    75 /* in sort.c */
    76 void sort (double *value, int N);
    77 void fsort (float *value, int N);
    78 void sortpair (double *value1, double *value2, int N);
    79 void fsortpair (float *X, float *Y, int N);
    80 void sortthree (float *X, float *Y, float *Z, int N);
    81 void sort_lists (float *X, float *Y, int *S, int N);
    82 void dsort_lists (double *X, double *Y, int *S, int N);
    83 void isort_pair (int *X, int *Y, int N);
    84 
    8575/* in fft.c */
    8676void fft1D (float *dataRe, float *dataIm, int N, int Nbit, int forward);
    … …  
    8878int IsBinary (int N, int *Nbit);
    8979
    90 /* in gaussj.c */
    91 int gaussj (double **a, int n, double **b, int m);
    92 int fgaussj (float **a, int n, float **b, int m);
     80/* in spline.c */
     81void spline_construct (float *x, float *y, int N, float *y2);
     82float spline_apply (float *x, float *y, float *y2, int N, float X);
    9383
    9484/* in svdcmp.c */
    9585int svdcmp (float *a, float *w, float *v, int Nx, int Ny);
    96 
    97 /* in spline.c */
    98 void spline (float *x, float *y, int N, float *y2);
    99 float splint (float *x, float *y, float *y2, int N, float X);
    10086
    10187/* mrqmin.c */
    … …  
    139125void mrq2dfree (int Npar);
    140126
    141 /* powell.c */
    142 void powell (float *p, int Npar, float (func)() );
    143 
    144127/* gaussian.c */
    145128double gaussian (double x, double mean, double sigma);

  • trunk/Ohana/src/opihi/lib.data/spline.c

    r2598 r16119  
    22
    33/* construct the natural spline for x, y in y2 */
    4 void spline (float *x, float *y, int N, float *y2) {
     4void spline_construct (float *x, float *y, int N, float *y2) {
    55
    66  int i;
    … …  
    2727
    2828/* evaluate spline for x, y, y2 at X */
    29 float splint (float *x, float *y, float *y2, int N, float X) {
     29float spline_apply (float *x, float *y, float *y2, int N, float X) {
    3030
    3131  int i, lo, hi;
    … …  
    3636  hi = N-1;
    3737  while (hi - lo > 1) {
    38     i = (hi+lo) >> 1;
    39     if (x[i] > X)
     38    i = 0.5*(hi+lo);
     39    if (x[i] > X) {
    4040      hi = i;
    41     else
     41    } else {
    4242      lo = i;
     43    }
    4344  }
    4445
Note: See TracChangeset for help on using the changeset viewer.