Changeset 39243 for trunk

Timestamp:

Dec 10, 2015, 2:48:58 PM (11 years ago)

Author:

watersc1

Message:

Fix typo where lambda was being dropped incorrectly.

File:

• trunk/Ohana/src/opihi/cmd.astro/fitplx_irls.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.astro/fitplx_irls.c

@@ -387 +387 @@
   double ax, ay;
   double bx, by;
-  double lambda;
+  double lambda_x, lambda_y;
   double sigma_robust_x, sigma_robust_y;
   double sigma_final_x,  sigma_final_y;
@@ -396 +396 @@
   ax = 0.0; ay = 0.0;
   bx = 0.0; by = 0.0;
-  lambda = 0.0;
+
   for (i = 0; i < Npts; i++) {
     Wx[i] = weight_cauchy(rx[i] / dX[i]);
@@ -415 +415 @@
   by /= 1.0 * (Npts - p);
 
-  sigma_robust_x = lambda * sqrt(bx) * sigma_hat * 2.385 / ax;
-  sigma_robust_y = lambda * sqrt(by) * sigma_hat * 2.385 / ay;
+  lambda_x = 1.0 + (p / Npts) * (1 - ax) / ax;
+  lambda_y = 1.0 + (p / Npts) * (1 - ay) / ay;
+  
+  sigma_robust_x = lambda_x * sqrt(bx) * sigma_hat * 2.385 / ax;
+  sigma_robust_y = lambda_y * sqrt(by) * sigma_hat * 2.385 / ay;
 
   // This is actually sigma^2, as that's the factor in the covariance (dumouchel 4.1)