Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relastro/src/fitpoly.c

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/src/fitpoly.c (modified) (5 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relastro/src/fitpoly.c

@@ -78 +78 @@
 }
   
+int array_print (double **matrix, int Nx, int Ny) {
+
+  int i, j;
+  for (i = 0; i < Nx; i++) {
+    for (j = 0; j < Ny; j++) {
+      fprintf (stderr, "%10.3e ", matrix[i][j]);
+    }
+    fprintf (stderr, "\n");
+  }
+  return TRUE;
+}
+
+int fit_print (CoordFit *fit) {
+
+  fprintf (stderr, "Npts: %d, Norder: %d, Nterms: %d, Nsums: %d, Nelems: %d\n",
+           fit[0].Npts, fit[0].Norder, fit[0].Nterms, fit[0].Nsums, fit[0].Nelems);
+
+  fprintf (stderr, "sums: \n");
+  array_print (fit[0].sum, fit[0].Nsums, fit[0].Nsums);
+
+  fprintf (stderr, "xsums: \n");
+  array_print (fit[0].xsum, fit[0].Nterms, fit[0].Nterms);
+
+  fprintf (stderr, "ysums: \n");
+  array_print (fit[0].ysum, fit[0].Nterms, fit[0].Nterms);
+
+  fprintf (stderr, "xfits: \n");
+  array_print (fit[0].xfit, fit[0].Nterms, fit[0].Nterms);
+
+  fprintf (stderr, "yfits: \n");
+  array_print (fit[0].yfit, fit[0].Nterms, fit[0].Nterms);
+  
+  return TRUE;
+}
+
 // XXX use implicit masks as below or explicit masks (with function to set?)
 // XXX eg, add a global mask to this file and 
@@ -134 +169 @@
       for (j = 0; j < fit[0].Nelems; j++) {
         matrix[i][j] = 0.0;
+        matrix[j][i] = 0.0;
       }
       vector[i][0] = 0.0;
@@ -148 +184 @@
   }     
   
-  if (!dgaussjordan (matrix, vector, fit[0].Nelems, 2)) {
+  if (!dgaussjordan_pivot (matrix, vector, fit[0].Nelems, 2, 1e-16)) {
     array_free (matrix, fit[0].Nelems);
     array_free (vector, fit[0].Nelems);
@@ -277 +313 @@
 /* this should only apply to the polynomial, not the projection terms */
 /* compare with psastro supporting code */
+// this code will work for linear (Npolyterm == 0 or 1) and linear + map fits
 int fit_apply_coords (CoordFit *fit, Coords *coords, int keepRef) {
 
@@ -352 +389 @@
   /* keep the order and type from initial values */
   
+  if (isnan(coords[0].crval1)) {
+    return FALSE;
+  }
+  if (isnan(coords[0].crval2)) {
+    return FALSE;
+  }
+  if (isnan(coords[0].crpix1)) {
+    return FALSE;
+  }
+  if (isnan(coords[0].crpix2)) {
+    return FALSE;
+  }
+
   return (TRUE);
 }