Changeset 39239

Timestamp:

Dec 9, 2015, 8:42:01 AM (11 years ago)

Author:

eugene

Message:

add a test script

Location:

trunk/Ohana/src/relastro

Files:

• Makefile (modified) (3 diffs)
• src/FitAstromOps.c (modified) (1 diff)
• src/UpdateObjects.c (modified) (1 diff)
• src/fitpm.c (added)

trunk/Ohana/src/relastro/Makefile

@@ -10 +10 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
+TESTDIR =       $(HOME)/test
+TESTBIN =       $(HOME)/test
 include ../../Makefile.Common
 
@@ -21 +23 @@
 
 install: $(DESTBIN)/relastro $(DESTBIN)/relastro_client 
-
-# $(DESTBIN)/testparallax
 
 RELASTRO = \
@@ -161 +161 @@
 $(TESTPAR): $(INC)/relastro.h
 $(BIN)/testparallax.$(ARCH): $(TESTPAR)
+
+fitpm: $(BIN)/fitpm.$(ARCH)
+
+FITPM = \
+$(SRC)/fitpm.$(ARCH).o        \
+$(SRC)/ParFactor.$(ARCH).o           \
+$(SRC)/FitAstromOps.$(ARCH).o        \
+$(SRC)/FitPM.$(ARCH).o               \
+$(SRC)/FitPM_IRLS.$(ARCH).o               \
+$(SRC)/mkpolyterm.$(ARCH).o            \
+$(SRC)/fitpoly.$(ARCH).o
+
+$(FITPM): $(INC)/relastro.h
+$(BIN)/fitpm.$(ARCH): $(FITPM)

trunk/Ohana/src/relastro/src/FitAstromOps.c

@@ -2 +2 @@
 
 // I am modifying FitPM with an eye to (a) threaded operations and (b) bootstrap resampling tests.
+
+int FitAstromPoints_Project (FitStats *fitStats, double *Tmean, double *Trange, double *parRange) {
+
+  int k;
+
+  int Npoints = fitStats->Npoints;
+  FitAstromPoint *points = fitStats->points;
+
+  // find Tmin & Tmax from the list of accepted measurements
+  double Tmin  = points[0].T;
+  double Tmax  = points[0].T;
+  double pRmin = +2.0;
+  double pRmax = -2.0;
+  double pDmin = +2.0;
+  double pDmax = -2.0;
+
+  *Tmean = 0.0;
+
+  double Tsum = 0.0;
+  double Wsum = 0.0;
+  for (k = 0; k < Npoints; k++) {
+    Tmin = MIN(Tmin, points[k].T);
+    Tmax = MAX(Tmax, points[k].T);
+
+    float wx = 1.0 / SQ(points[k].dX);
+
+    Tsum += points[k].T * wx;
+    Wsum += wx;
+
+    // at this point, T is in years since J2000
+    ParFactor (&points[k].pR, &points[k].pD, points[k].R, points[k].D, points[k].T);
+    pRmin = MIN (pRmin, points[k].pR);
+    pRmax = MAX (pRmax, points[k].pR);
+    pDmin = MIN (pDmin, points[k].pD);
+    pDmax = MAX (pDmax, points[k].pD);
+  }
+  *Trange = Tmax - Tmin;
+
+  // mean epoch
+  *Tmean = Tsum / Wsum;
+
+  // for HIGH_SPEED, just use the center of the range
+  if (RELASTRO_OP == OP_HIGH_SPEED) {
+    *Tmean = 0.5*(Tmax - Tmin);
+  }
+
+  *parRange = hypot (pRmax - pRmin, pDmax - pDmin);
+
+  /* we need to do the fit in a locally linear space; choose a ref coordinate */
+  fitStats->coords.crval1 = points[0].R;
+  fitStats->coords.crval2 = points[0].D;
+
+  // project all of the R,D coordinates to a plane centered on this coordinate. set
+  // the times to be relative to Tmean
+  for (k = 0; k < Npoints; k++) {
+    RD_to_XY (&points[k].X, &points[k].Y, points[k].R, points[k].D, &fitStats->coords);
+    points[k].T -= *Tmean;
+  }       
+  return TRUE;
+}
 
 FitStats *FitStatsInit (int Nmax, int Nboot) {

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -625 +625 @@
 }
 
-int FitAstromPoints_Project (FitStats *fitStats, double *Tmean, double *Trange, double *parRange) {
-
-  int k;
-
-  int Npoints = fitStats->Npoints;
-  FitAstromPoint *points = fitStats->points;
-
-  // find Tmin & Tmax from the list of accepted measurements
-  double Tmin  = points[0].T;
-  double Tmax  = points[0].T;
-  double pRmin = +2.0;
-  double pRmax = -2.0;
-  double pDmin = +2.0;
-  double pDmax = -2.0;
-
-  *Tmean = 0.0;
-
-  double Tsum = 0.0;
-  double Wsum = 0.0;
-  for (k = 0; k < Npoints; k++) {
-    Tmin = MIN(Tmin, points[k].T);
-    Tmax = MAX(Tmax, points[k].T);
-
-    float wx = 1.0 / SQ(points[k].dX);
-
-    Tsum += points[k].T * wx;
-    Wsum += wx;
-
-    // at this point, T is in years since J2000
-    ParFactor (&points[k].pR, &points[k].pD, points[k].R, points[k].D, points[k].T);
-    pRmin = MIN (pRmin, points[k].pR);
-    pRmax = MAX (pRmax, points[k].pR);
-    pDmin = MIN (pDmin, points[k].pD);
-    pDmax = MAX (pDmax, points[k].pD);
-  }
-  *Trange = Tmax - Tmin;
-
-  // mean epoch
-  *Tmean = Tsum / Wsum;
-
-  // for HIGH_SPEED, just use the center of the range
-  if (RELASTRO_OP == OP_HIGH_SPEED) {
-    *Tmean = 0.5*(Tmax - Tmin);
-  }
-
-  *parRange = hypot (pRmax - pRmin, pDmax - pDmin);
-
-  /* we need to do the fit in a locally linear space; choose a ref coordinate */
-  fitStats->coords.crval1 = points[0].R;
-  fitStats->coords.crval2 = points[0].D;
-
-  // project all of the R,D coordinates to a plane centered on this coordinate. set
-  // the times to be relative to Tmean
-  for (k = 0; k < Npoints; k++) {
-    RD_to_XY (&points[k].X, &points[k].Y, points[k].R, points[k].D, &fitStats->coords);
-    points[k].T -= *Tmean;
-  }       
-  return TRUE;
-}
-
 int CatalogMaxNmeasure (Catalog *catalog, int Ncatalog) {