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

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/src/FitAstromOps.c (modified) (5 diffs)

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

@@ -12 +12 @@
   fitStats->Noffset = 0;
 
-  // container to hold the fit results (Nboot > 1 for bootstrap resampling)
-  fitStats->fit = NULL;
+  fitStats->values = NULL; // pre-allocated array for median & robust sigma
+  fitStats->fit = NULL; // container to hold the fit results (Nboot > 1 for bootstrap resampling)
   fitStats->Nfit = 0;
   fitStats->NfitAlloc = Nboot;
   if (Nboot > 0) {
     ALLOCATE (fitStats->fit, FitAstromResult, Nboot);
+    ALLOCATE (fitStats->values, double, Nboot);
   }
 
@@ -31 +32 @@
 
   // pre-allocated fit matrices for the 3 fit options
-  fitStats->fitPos = NULL;
-  fitStats->fitPM  = NULL;
-  fitStats->fitPar = NULL;
+  fitStats->fitdataPos = NULL;
+  fitStats->fitdataPM  = NULL;
+  fitStats->fitdataPar = NULL;
 
   if (Nmax > 0) {
-    fitStats->fitPos = FitAstromDataInit (2);
-    fitStats->fitPM  = FitAstromDataInit (4);
-    fitStats->fitPar = FitAstromDataInit (5);
+    fitStats->fitdataPos = FitAstromDataInit (2);
+    fitStats->fitdataPM  = FitAstromDataInit (4);
+    fitStats->fitdataPar = FitAstromDataInit (5);
   }
 
@@ -72 +73 @@
 
   FREE (fitStats->fit);
+  FREE (fitStats->values);
   FREE (fitStats->points);
   FREE (fitStats->sample);
 
-  FitAstromDataFree (fitStats->fitPos);
-  FitAstromDataFree (fitStats->fitPM);
-  FitAstromDataFree (fitStats->fitPar);
+  FitAstromDataFree (fitStats->fitdataPos);
+  FitAstromDataFree (fitStats->fitdataPM);
+  FitAstromDataFree (fitStats->fitdataPar);
 
   free (fitStats);
@@ -105 +107 @@
 }
 
-}  
-
-void FitAstromObjectInit (FitAstromObject *object) {
+void FitAstromPointInit (FitAstromObject *object) {
   object->X      = 0.0;
   object->Y      = 0.0;
@@ -125 +125 @@
 }
 
-void freeObjectData () {
+void FitAstromResultInit (FitAstromResult *fit) {
 
-  free (R);
-  free (D);
-  free (T);
-  free (X);
-  free (Y);
+  fit->Ro  = 0.0;
+  fit->dRo = 0.0;
+  fit->Do  = 0.0;
+  fit->dDo = 0.0;
+  fit->uR  = 0.0;
+  fit->duR = 0.0;
+  fit->uD  = 0.0;
+  fit->duD = 0.0;
+  fit->p   = 0.0;
+  fit->dp  = 0.0;
 
-  free (dR);
-  free (dD);
-  free (dT);
-  free (dX);
-  free (dY);
-
-  free (pX);
-  free (pY);
-
-  free (C_blue);
-  free (C_red);
-}  
-
+  fit->chisq = NAN;
+  fit->Nfit = 0;
+  
+  return;
+}