Changeset 39266 for branches/eam_branches/ipp-20151113/Ohana/src/relastro/include/relastro.h

Timestamp:

Dec 13, 2015, 5:50:46 AM (11 years ago)

Author:

eugene

Message:

merged changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• Ohana/src/relastro/include/relastro.h (modified) (6 diffs)

branches/eam_branches/ipp-20151113/Ohana/src/relastro/include/relastro.h

@@ -134 +134 @@
   double **A;
   double **B;
+  double **Cov;
+  double *Beta;
+  double *Beta_prev;
   int Nterms;
+  int getChisq;
+  int getError;
 } FitAstromData;
 
+// XXX do we need doubles for all of these?  I actually only have of order 100 of these
+// allocated at a time, so size is not an issue.
 typedef struct {
   double X, dX;
@@ -143 +150 @@
   double D, dD;
   double T, dT;
+  double Wx, Wy;
+  double rx, ry;
+  double u;
   double pR;
   double pD;
@@ -148 +158 @@
   double C_red;
   int measure;
+  int mask;
 } FitAstromPoint;
 
@@ -164 +175 @@
   FitAstromPoint *points;
   FitAstromPoint *sample;
+  FitAstromPoint *nomask;
   int Npoints;
   int NpointsAlloc;
@@ -723 +735 @@
 int BootstrapRobustStats (FitAstromResult *result, FitAstromResult *fit, int Nfit, int mode);
 int BootstrapResample (FitAstromPoint *sample, FitAstromPoint *points, int Npoints);
+int BootstrapSaveUnmasked (FitAstromPoint *nomask, FitAstromPoint *points, int Npoints);
+
 int CatalogMaxNmeasure (Catalog *catalog, int Ncatalog);
 int FitAstromPoints_Project (FitStats *fitStats, double *Tmean, double *Trange, double *parRange);
@@ -739 +753 @@
 int FitAstromResultSetPM (FitAstromResult *fit, int Nfit, Average *average);
 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);
+
+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);
+double dpsi_cauchy (double x);