Changeset 38605

Timestamp:

Jul 19, 2015, 12:51:52 PM (11 years ago)

Author:

eugene

Message:

working on relastro

Location:

branches/eam_branches/ipp-20150625/Ohana/src/relastro

Files:

• Makefile (modified) (1 diff)
• include/relastro.h (modified) (4 diffs)
• src/FitAstromOps.c (modified) (1 diff)
• src/FitPosPMfixed.c (modified) (1 diff)
• src/ImageOps.c (modified) (1 diff)
• src/UpdateObjects.c (modified) (5 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/relastro/Makefile

@@ -27 +27 @@
 $(SRC)/FitMosaic.$(ARCH).o           \
 $(SRC)/FitPM.$(ARCH).o               \
-$(SRC)/FitPar.$(ARCH).o              \
 $(SRC)/FitPMandPar.$(ARCH).o         \
+$(SRC)/FitPosPMfixed.$(ARCH).o       \
 $(SRC)/FitSimple.$(ARCH).o           \
 $(SRC)/ImageOps.$(ARCH).o            \

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

@@ -143 +143 @@
   double D, dD;
   double T, dT;
-  double pX;
-  double pY;
+  double pR;
+  double pD;
   double C_blue;
   double C_red;
@@ -498 +498 @@
 
 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 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);
@@ -706 +706 @@
 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 BootstrapResample (FitAstromPoint *sample, FitAstromPoint *points, int Npoints);
 int CatalogMaxNmeasure (Catalog *catalog, int Ncatalog);
 int FitAstromPoints_Project (FitStats *fitStats, double *Tmean, double *Trange, double *parRange);
@@ -714 +714 @@
 
 void FitAstromResultInit (FitAstromResult *fit);
-void FitAstromPointInit (FitAstromObject *object);
+void FitAstromPointInit (FitAstromPoint *object);
 void FitAstromDataFree (FitAstromData *fit);
 FitAstromData *FitAstromDataInit (int Nterms);

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/FitAstromOps.c

@@ -118 +118 @@
   object->dD     = 0.0;
   object->dT     = 0.0;
-  object->pX     = 0.0;
-  object->pY     = 0.0;
+  object->pR     = 0.0;
+  object->pD     = 0.0;
   object->C_blue = 0.0;
   object->C_red  = 0.0;

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/FitPosPMfixed.c

@@ -5 +5 @@
   int i;
 
-  double wx, wy, Wx, Wy, Tx, Ty, Tx2, Ty2, Xs, Ys, XT, YT;
+  double wx, wy, Wx, Wy, Tx, Ty, Xs, Ys;
 
   myAssert (data->Nterms == 2, "invalid fit arrays");

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/ImageOps.c

@@ -748 +748 @@
     n = measure[0].averef;
 
-    // apply proper-motion from average position to measure epoch:
-    float dTime = (measure[k].t - catalog[c].average[n].Tmean) / (86400*365.25) ; // time relative to Tmean in years
-
     /* apply the current image transformation or use the current value of R+dR, D+dD? */
     ref[i].R = catalog[c].average[n].R;
     ref[i].D = catalog[c].average[n].D;
     
-    // XXX do this in a better way?
-    ref[i].R += dTime * catalog[c].average[n].uR / 3600.0 / cos(ref[i].D*RAD_DEG);
-    ref[i].D += dTime * catalog[c].average[n].uD / 3600.0;
+    if (USE_GALAXY_MODEL) {
+      // apply proper-motion from average position to measure epoch:
+      float dTime = (measure[0].t - catalog[c].average[n].Tmean) / (86400*365.25) ; // time relative to Tmean in years
+
+      // XXX do this in a better way?
+      ref[i].R += dTime * catalog[c].average[n].uR / 3600.0 / cos(ref[i].D*RAD_DEG);
+      ref[i].D += dTime * catalog[c].average[n].uD / 3600.0;
+    }
 
     // if we are correcting for the Galaxy Motion Model, we assume the mean R,D is at the J2000 epoch position
-    if (USE_GALAXY_MODEL) {
+    if (0) {
       myAssert (!isnan(measure[0].RoffGAL), "oops");
       myAssert (!isnan(measure[0].DoffGAL), "oops");

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/UpdateObjects.c

@@ -40 +40 @@
 
       UpdateObjects_Stack(average, secfilt, measure, measureBig, Nsecfilt, fitStatsStack);
-      UpdateObjects_Chips(average, secfilt, measure, measureBig, Nsecfilt, fitStatsChips, i, m, Nloop);
+      UpdateObjects_Chips(average, secfilt, measure, measureBig, Nsecfilt, fitStatsChips, i, m);
     }
     if (VERBOSE2) fprintf (stderr, "catalog %d : chips "OFF_T_FMT" ave, "OFF_T_FMT" pm, "OFF_T_FMT" par : Nskip "OFF_T_FMT", Noffset "OFF_T_FMT"\n",  i,  fitStatsChips.Nave,  fitStatsChips.Npm,  fitStatsChips.Npar,  fitStatsChips.Nskip, fitStatsChips.Noffset);
@@ -591 +591 @@
   double Tmin  = points[0].T;
   double Tmax  = points[0].T;
-  double pXmin = +2.0;
-  double pXmax = -2.0;
-  double pYmin = +2.0;
-  double pYmax = -2.0;
+  double pRmin = +2.0;
+  double pRmax = -2.0;
+  double pDmin = +2.0;
+  double pDmax = -2.0;
 
   *Tmean = 0.0;
@@ -603 +603 @@
 
     // at this point, T is in years since J2000
-    ParFactor (&points[k].pX, &points[k].pY, points[k].R, points[k].D, points[k].T);
-    pXmin = MIN (pXmin, points[k].pX);
-    pXmax = MAX (pXmax, points[k].pX);
-    pYmin = MIN (pYmin, points[k].pY);
-    pYmax = MAX (pYmax, points[k].pY);
+    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;
@@ -619 +619 @@
   }
 
-  double dXRange = pXmax - pXmin;
-  double dYRange = pYmax - pYmin;
-  *parRange = hypot (dXRange, dYRange);
+  *parRange = hypot (pRmax - pRmin, pDmax - pDmin);
 
   /* we need to do the fit in a locally linear space; choose a ref coordinate */
@@ -650 +648 @@
 }
 
-int BootstrapResample (FitAstromPoints *sample, FitAstromPoints *points, int Npoints) {
+int BootstrapResample (FitAstromPoint *sample, FitAstromPoint *points, int Npoints) {
   int i;