Changeset 39229

Timestamp:

Dec 3, 2015, 5:34:56 PM (11 years ago)

Author:

eugene

Message:

merge common code again (fitpm/fitpm_irls)

File:

• trunk/Ohana/src/opihi/include/astro.h (modified) (2 diffs)

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

@@ -51 +51 @@
 int PlxBootstrapResample (PlxFitData *src, PlxFitData *tgt);
 
+int FitPMonly (PlxFit *fit, double *X, double *dX, double *Y, double *dY, double *T, int Npts, int VERBOSE);
 int FitPMandPar (PlxFit *fit, double *X, double *dX, double *Y, double *dY, double *T, double *pR, double *pD, int Npts, int VERBOSE);
 int sun_ecliptic (double mjd, double *lambda, double *beta, double *epsilon, double *Radius);
@@ -57 +58 @@
 /***** */
 
+int FitPMonly_IRLS (PlxFit *fit, double *X, double *dX, double *Y, double *dY, double *T, int Npts, int VERBOSE);
 int FitPMandPar_IRLS (PlxFit *fit, double *X, double *dX, double *Y, double *dY, double *T, double *pR, double *pD, double *Wx, double *Wy, int Npts, int max_iterations, double outlier_limit, int VERBOSE);
 
-// ?? int IRLS_converged (PlxFit *fit);
-int Plx_weighted_LS (double *T, double *pR, double *pD, double *X, double *WX, double *Y, double *WY, int Npts,
-                     double **A, double **B, int VERBOSE);
-double Plx_weight_cauchy (double x);
-double Plx_dpsi_cauchy (double x);
-double Plx_MAD(double *in, int N);
+int weighted_LS_PLX (double *T, double *pR, double *pD, double *X, double *WX, double *Y, double *WY, int Npts, double **A, double **B, int VERBOSE);
+int weighted_LS_PM (double *T, double *X, double *WX, double *Y, double *WY, int Npts, double **A, double **B, int VERBOSE);
+
+double weight_cauchy (double x);
+double dpsi_cauchy (double x);
+double MedianAbsDeviation(double *in, int N);
 
 # endif