Changeset 20936 for trunk/Ohana/src/opihi/include/data.h

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/include/data.h (modified) (3 diffs)

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

@@ -78 +78 @@
 void fft1D (float *dataRe, float *dataIm, int N, int Nbit, int forward);
 int fftND (float *dataRe, float *dataIm, int Ndim, int *Nsize, int forward);
+void dfft1D (double *dataRe, double *dataIm, int N, int Nbit, int forward);
+int dfftND (double *dataRe, double *dataIm, int Ndim, int *Nsize, int forward);
 int IsBinary (int N, int *Nbit);
 
@@ -85 +87 @@
 
 /* in svdcmp.c */
-int svdcmp (float *a, float *w, float *v, int Nx, int Ny);
+int svdcmp (float *a, opihi_flt *w, float *v, int Nx, int Ny);
 
 /* mrqmin.c */
-float mrqcof (float *x, float *y, float *dy, int Npts, 
-              float *par, int Npar, float **ta, float **tb, 
-              float (funcs)(float, float *, int, float *));
+opihi_flt mrqcof (opihi_flt *x, opihi_flt *y, opihi_flt *dy, int Npts, 
+              opihi_flt *par, int Npar, opihi_flt **ta, opihi_flt **tb, 
+              opihi_flt (funcs)(opihi_flt, opihi_flt *, int, opihi_flt *));
 
-float mrqmin (float *x, float *y, float *dy, int Npts, 
-              float *par, int Npar, 
-              float (funcs)(float, float *, int, float *), int VERBOSE);
+opihi_flt mrqmin (opihi_flt *x, opihi_flt *y, opihi_flt *dy, int Npts, 
+              opihi_flt *par, int Npar, 
+              opihi_flt (funcs)(opihi_flt, opihi_flt *, int, opihi_flt *), int VERBOSE);
 
-float mrqinit (float *x, float *y, float *dy, int Npts, 
-               float *par, int Npar, 
-               float (funcs)(float, float *, int, float *), int VERBOSE);
+opihi_flt mrqinit (opihi_flt *x, opihi_flt *y, opihi_flt *dy, int Npts, 
+               opihi_flt *par, int Npar, 
+               opihi_flt (funcs)(opihi_flt, opihi_flt *, int, opihi_flt *), int VERBOSE);
 
-float **mrqcovar (int Npar);
+opihi_flt **mrqcovar (int Npar);
 
 void mrqfree (int Npar);
 
 /* mrq2dmin.c */
-float mrq2dcof (float *x, float *t, float *y, float *dy, int Npts, 
-                float *par, int Npar, float **ta, float **tb, 
-                float (funcs)(float, float, float *, int, float *));
+opihi_flt mrq2dcof (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+                opihi_flt *par, int Npar, opihi_flt **ta, opihi_flt **tb, 
+                opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *));
 
-float mrq2dmin (float *x, float *t, float *y, float *dy, int Npts, 
-                float *par, int Npar, 
-                float (funcs)(float, float, float *, int, float *), int VERBOSE);
+opihi_flt mrq2dmin (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+                opihi_flt *par, int Npar, 
+                opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *), int VERBOSE);
 
-float mrq2dinit (float *x, float *t, float *y, float *dy, int Npts, 
-                 float *par, int Npar, 
-                 float (funcs)(float, float, float *, int, float *), int VERBOSE);
+opihi_flt mrq2dinit (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+                 opihi_flt *par, int Npar, 
+                 opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *), int VERBOSE);
 
-float mrq2dchi (float *x, float *t, float *y, float *dy, int Npts, 
-                float *par, int Npar, 
-                float (funcs)(float, float, float *, int, float *));
+opihi_flt mrq2dchi (opihi_flt *x, opihi_flt *t, opihi_flt *y, opihi_flt *dy, int Npts, 
+                opihi_flt *par, int Npar, 
+                opihi_flt (funcs)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *));
 
-int mrq2dlimits (float *pmin, float *pmax, int Npar);
+int mrq2dlimits (opihi_flt *pmin, opihi_flt *pmax, int Npar);
 
-float **mrq2dcovar (int Npar);
+opihi_flt **mrq2dcovar (int Npar);
 
 void mrq2dfree (int Npar);
@@ -135 +137 @@
 double get_aperture_stats (Matrix *matrix, int X, int Y, int Npix, int Nborder, double max);
 int set_rough_radii (double Ra, double Ri, double Ro);
-int get_rough_star (float *data, int Nx, int Ny, int x, int y, float *xc, float *yc, float *sx, float *sy, float *sxy, float *zs, float *zp, float *sk);
+int get_rough_star (float *data, int Nx, int Ny, int x, int y, opihi_flt *xc, opihi_flt *yc, opihi_flt *sx, opihi_flt *sy, opihi_flt *sxy, opihi_flt *zs, opihi_flt *zp, opihi_flt *sk);
 
 /* precess.c */