Changeset 39365 for trunk/Ohana/src/relastro/include/relastro.h

Timestamp:

Feb 21, 2016, 6:00:44 AM (10 years ago)

Author:

eugene

Message:

consolidate irls and non-irls fitting; clean up rules for UpdateObjects

File:

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

trunk/Ohana/src/relastro/include/relastro.h

@@ -129 +129 @@
   double chisq;
   int Nfit;
+  int converged;
 } FitAstromResult;
 
@@ -527 +528 @@
 int sun_ecliptic (double jd, double *lambda, double *beta, double *epsilon, double *Radius);
 int ParFactor (double *pR, double *pD, double RA, double Dec, double Time);
-int FitPM (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
-int FitPMandPar (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
-int FitPosPMfixed (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
+
+int FitPM_Basic (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
+int FitPMandPar_Basic (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
+int FitPosPMfixed_Basic (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
 
 Mosaic *getMosaicForImage (off_t N);
@@ -754 +756 @@
 void AstromErrorSetLoop (int Nloop, int isImageMode);
 
-int FitPM_IRLS (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints, int VERBOSE);
-int FitPMandPar_IRLS (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints, int VERBOSE);
+int FitPM_IRLS (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
+int FitPMandPar_IRLS (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
+int FitPosPMfixed_IRLS (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints);
 
 double MedianAbsDeviation(FitAstromPoint *points, int Npoints);
-
-int weighted_LS_PM (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints, int VERBOSE);
-int weighted_LS_PLX (FitAstromResult *fit, FitAstromData *data, FitAstromPoint *points, int Npoints, int VERBOSE);
 
 double weight_cauchy (double x);