Changeset 38604 for branches/eam_branches/ipp-20150625/Ohana/src/relastro/include/relastro.h

Timestamp:

Jul 19, 2015, 6:26:28 AM (11 years ago)

Author:

eugene

Message:

big re-work of UpdateObjects to allow bootstrap resampling, outlier rejection, and fixed-pm fitting

File:

• branches/eam_branches/ipp-20150625/Ohana/src/relastro/include/relastro.h (modified) (6 diffs)

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

@@ -28 +28 @@
 
 typedef enum {TARGET_NONE, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS} FitTarget;
+
+typedef enum {
+  FIT_RESULT_RA,
+  FIT_RESULT_DEC,
+  FIT_RESULT_uR,
+  FIT_RESULT_uD,
+  FIT_RESULT_PLX,
+} FitAstromResultMode;
 
 typedef enum {
@@ -119 +127 @@
   double  p, dp;
 
-  int getChisq;
   double chisq;
   int Nfit;
@@ -140 +147 @@
   double C_blue;
   double C_red;
-} FitAstromPoints;
+} FitAstromPoint;
 
 typedef struct {
@@ -149 +156 @@
   off_t Noffset;
 
+  double *values;
   FitAstromResult *fit; // use bootstrap resampling to generate Nfit fits to measure the stats
   int Nfit;
   int NfitAlloc;
 
-  FitAstromPoints *points;
-  FitAstromPoints *sample;
+  FitAstromPoint *points;
+  FitAstromPoint *sample;
   int Npoints;
   int NpointsAlloc;
 
-  FitAstromData *fitPos;
-  FitAstromData *fitPM;
-  FitAstromData *fitPar;
+  FitAstromData *fitdataPos;
+  FitAstromData *fitdataPM;
+  FitAstromData *fitdataPar;
 
   Coords coords;
@@ -491 +499 @@
 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, double Tmean);
-int FitPM (PMFit *fit, double *X, double *dX, double *Y, double *dY, double *T, int Npts, int XVERB);
-int FitPar (PMFit *fit, double *X, double *dX, double *Y, double *dY, double *pR, double *pD, int Npts);
-int FitPMandPar (PMFit *fit, double *X, double *dX, double *Y, double *dY, double *T, double *pR, double *pD, int Npts, int XVERB);
+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);
 
 Mosaic *getMosaicForImage (off_t N);
@@ -694 +702 @@
 int client_logger_init (char *dirname);
 int client_logger_message (char *format,...);
+
+int FitAstromSetChisq (FitAstromResult *fit, FitAstromPoint *points, int Npoints, FitMode mode);
+double VectorFractionInterpolate (double *values, float fraction, int Npts);
+int BootstrapRobustStats (FitAstromResult *result, FitAstromResult *fit, int Nfit, int mode);
+int BootstrapResample (FitAstromPoints *sample, FitAstromPoints *points, int Npoints);
+int CatalogMaxNmeasure (Catalog *catalog, int Ncatalog);
+int FitAstromPoints_Project (FitStats *fitStats, double *Tmean, double *Trange, double *parRange);
+int UpdateObjects_SelectMeasures (FitStats *fit, Average *average, SecFilt *secfilt, MeasureTiny *measure, Measure *measureBig, int cat, off_t measOff);
+int UpdateObjects_Stack (Average *average, SecFilt *secfilt, MeasureTiny *measure, Measure *measureBig, int Nsecfilt, FitStats *fitStats);
+int UpdateObjects_Chips (Average *average, SecFilt *secfilt, MeasureTiny *measure, Measure *measureBig, int Nsecfilt, FitStats *fitStats, int cat, off_t measOff);
+
+void FitAstromResultInit (FitAstromResult *fit);
+void FitAstromPointInit (FitAstromObject *object);
+void FitAstromDataFree (FitAstromData *fit);
+FitAstromData *FitAstromDataInit (int Nterms);
+void FitStatsFree (FitStats *fitStats);
+void FitStatsSum (FitStats *src, FitStats *tgt);
+void FitStatsReset (FitStats *tgt);
+FitStats *FitStatsInit (int Nmax, int Nboot);