Changeset 39168 for trunk

Timestamp:

Nov 19, 2015, 5:43:11 PM (11 years ago)

Author:

watersc1

Message:

Fixed transposition that was critically broken for fitplx_irls, but seemed to have dodged through in fitpm_irls.

Location:

trunk/Ohana/src/opihi/cmd.astro

Files:

• fitplx_irls.c (modified) (4 diffs)
• fitpm_irls.c (modified) (2 diffs)

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

@@ -359 +359 @@
   sigma_ols = 0.0;
   for (i = 0; i < Npts; i++) {
-    rx[i] = X[i] - (T[i] * B[0][0] + B[1][0] + B[4][0] * pR[i]);
-    ry[i] = Y[i] - (T[i] * B[2][0] + B[3][0] + B[4][0] * pD[i]);
+    rx[i] = X[i] - (T[i] * B[1][0] + B[0][0] + B[4][0] * pR[i]);
+    ry[i] = Y[i] - (T[i] * B[3][0] + B[2][0] + B[4][0] * pD[i]);
     //    u[i] = r[i] /
     sigma_ols += SQ(rx[i]) + SQ(ry[i]);
@@ -383 +383 @@
   iterations = 0;
   do {
+    if (VERBOSE == 2) {
+      fprintf(stderr,"Iteration: %d (%f %f %f %f %f) sigmas: %f %f\n",
+              iterations,
+              Beta[0],Beta[1],Beta[2],Beta[3],Beta[4],
+              sigma_ols, sigma_hat);
+    }
     // Save Beta
     for (i = 0; i < 5; i++) {
@@ -408 +414 @@
     // Calculate r vector of residuals
     for (i = 0; i < Npts; i++) {
-      rx[i] = X[i] - (T[i] * B[0][0] + B[1][0] + B[4][0] * pR[i]);
-      ry[i] = Y[i] - (T[i] * B[2][0] + B[3][0] + B[4][0] * pD[i]);
+      rx[i] = X[i] - (T[i] * B[1][0] + B[0][0] + B[4][0] * pR[i]);
+      ry[i] = Y[i] - (T[i] * B[3][0] + B[2][0] + B[4][0] * pD[i]);
       IRLS_u[i] = sqrt(SQ(rx[i] / dX[i]) + SQ(ry[i] / dY[i]));
     }
@@ -426 +432 @@
 
     iterations++;
-    if (iterations > max_iterations) {
+    if (iterations >= max_iterations) {
       converged = TRUE;
       // Throw a warning or something here.

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

@@ -231 +231 @@
   sigma_ols = 0.0;
   for (i = 0; i < Npts; i++) {
-    rx[i] = X[i] - (T[i] * B[0][0] + B[1][0]);
-    ry[i] = Y[i] - (T[i] * B[2][0] + B[3][0]);
+    rx[i] = X[i] - (T[i] * B[1][0] + B[0][0]);
+    ry[i] = Y[i] - (T[i] * B[3][0] + B[2][0]);
     //    u[i] = r[i] /
     sigma_ols += SQ(rx[i]) + SQ(ry[i]);
@@ -280 +280 @@
     sigma_hat = 0.0;
     for (i = 0; i < Npts; i++) {
-      rx[i] = X[i] - (T[i] * B[0][0] + B[1][0]);
-      ry[i] = Y[i] - (T[i] * B[2][0] + B[3][0]);
+      rx[i] = X[i] - (T[i] * B[1][0] + B[0][0]);
+      ry[i] = Y[i] - (T[i] * B[3][0] + B[2][0]);
       u[i] = sqrt(SQ(rx[i] / dX[i]) + SQ(ry[i] / dY[i]));
     }