Changeset 37646

Timestamp:

Nov 20, 2014, 6:31:06 AM (12 years ago)

Author:

eugene

Message:

clean up some verbosity; zero out rows as well as colums associated with masked fitted elements

Location:

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src

Files:

• FitChip.c (modified) (1 diff)
• ImageOps.c (modified) (1 diff)
• fitpoly.c (modified) (2 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/FitChip.c

@@ -334 +334 @@
   int i;
   for (i = 0; i < Npts; i++) {
-    fprintf (f, "%4d %10.6f %10.6f  %10.6f %10.6f  %9.2f %9.2f  %9.2f %9.2f\n", 
-             i, raw[i].R, raw[i].D, raw[i].P, raw[i].Q, raw[i].L, raw[i].M, raw[i].X, raw[i].Y);
+    fprintf (f, "%4d %10.6f %10.6f  %10.6f %10.6f  %9.2f %9.2f  %9.2f %9.2f  %9.4f\n", 
+             i, raw[i].R, raw[i].D, raw[i].P, raw[i].Q, raw[i].L, raw[i].M, raw[i].X, raw[i].Y, raw[i].dPos);
   }
   fclose (f);

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/ImageOps.c

@@ -207 +207 @@
     if (VERBOSE2 || (MATCHCAT && (N_onImage[i] < 20))) {
       name = GetPhotcodeNamebyCode (image[i].photcode);
-      fprintf (stderr, "image "OFF_T_FMT" (%d, %s) has "OFF_T_FMT" of %d measures (%s, %s)",  i,  image[i].imageID, image[i].name, N_onImage[i], image[i].nstar,
+      int showExample = (Nfew < 30);
+      if (showExample) fprintf (stderr, "image "OFF_T_FMT" (%d, %s) has "OFF_T_FMT" of %d measures (%s, %s) ",  i,  image[i].imageID, image[i].name, N_onImage[i], image[i].nstar,
                ohana_sec_to_date(image[i].tzero), name);
       if (N_onImage[i] < 20) {
-        fprintf (stderr, "*");
+        if (showExample) fprintf (stderr, "*");
         Nfew ++;
       } 
       if (N_onImage[i] < 15) {
-        fprintf (stderr, "*** warning ***");
+        if (showExample) fprintf (stderr, "*** warning ***");
         Nbad ++;
       } 
-      fprintf (stderr, "\n");
+      if (showExample) fprintf (stderr, "\n");
     }
   }

branches/eam_branches/ipp-20140904/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;