Changeset 39223 for branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro

Timestamp:

Dec 3, 2015, 4:13:55 PM (11 years ago)

Author:

eugene

Message:

add fitpm_irls, fitplx_irls

Location:

branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 diff)
• fitplx_irls.c (copied) (copied from trunk/Ohana/src/opihi/cmd.astro/fitplx_irls.c )
• fitpm_irls.c (modified) (2 diffs)
• init.c (modified) (2 diffs)

branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro/Makefile

@@ -35 +35 @@
 $(SRC)/fitplx.$(ARCH).o    \
 $(SRC)/fitpm.$(ARCH).o     \
+$(SRC)/fitpm_irls.$(ARCH).o  \
+$(SRC)/fitplx_irls.$(ARCH).o  \
 $(SRC)/fixwrap.$(ARCH).o           \
 $(SRC)/fixcols.$(ARCH).o           \

branches/eam_branches/ipp-20151113/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]));
     }

branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro/init.c

@@ -20 +20 @@
 int fitplx                  PROTO((int, char **));
 int fitpm                   PROTO((int, char **));
+int fitpm_irls              PROTO((int, char **));
+int fitplx_irls             PROTO((int, char **));
 int fixwrap                 PROTO((int, char **));
 int fiximage                PROTO((int, char **));
@@ -87 +89 @@
   {1, "fitplx",      fitplx,       "fit proper motion and parallax"},
   {1, "fitpm",       fitpm,        "fit proper motion only"},
+  {1, "fitpm_irls",  fitpm_irls,   "fit proper motion only using irls method"},
+  {1, "fitplx_irls", fitplx_irls,  "fit proper motion and parallax using irls method"},
   {1, "fixwrap",     fixwrap,      "fix megacam over-wrapped pixels"},
   {1, "fiximage",    fiximage,     "fix pixels in an image by interpolation"},