Changeset 33405

Timestamp:

Mar 4, 2012, 5:34:35 PM (14 years ago)

Author:

eugene

Message:

remove a bunch of test print statements; use new ubercalDist field in secfilt

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (2 diffs)
• MosaicOps.c (modified) (3 diffs)
• StarOps.c (modified) (7 diffs)
• reload_catalogs.c (modified) (1 diff)
• relphot.c (modified) (1 diff)
• setMrelFinal.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/ImageOps.c

@@ -401 +401 @@
   for (i = 0; i < Nimage; i++) {
     
-    // XXXX TEST
-    Nfew = Nbad = Nmos = Ngrid = Nrel = Nsys = 0;
-
     /* on PoorImages run, skip good images */
     if (PoorImages) {
@@ -483 +480 @@
     /* N_onImage[i] is all measurements, N is good measurements */
 
-    // XXX TEST
-    fprintf (stderr, "meas skipped: (Nbad: %d, Nmos: %d, Ngrid: %d, Nrel: %d, Nsys: %d)\n", Nbad, Nmos, Ngrid, Nrel, Nsys);
+    // if (VERBOSE2) fprintf (stderr, "meas skipped: (Nbad: %d, Nmos: %d, Ngrid: %d, Nrel: %d, Nsys: %d)\n", Nbad, Nmos, Ngrid, Nrel, Nsys);
 
     /* too few good measurements or too many bad measurements */

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/MosaicOps.c

@@ -441 +441 @@
         off_t im = MosaicToImage[i][j];
         image[im].ubercalDist = mosaic[i].ubercalDist;
-        fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
+        // fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
       }
       if (KEEP_UBERCAL) continue;
@@ -522 +522 @@
     }
     liststats (list, dlist, N, &stats);
-    if (PoorImages) fprintf (stderr, "Mmos: %f %f %d "OFF_T_FMT"\n", stats.mean, stats.sigma, stats.Nmeas,  N);
+    if (VERBOSE2 && PoorImages) fprintf (stderr, "Mmos: %f %f %d "OFF_T_FMT"\n", stats.mean, stats.sigma, stats.Nmeas,  N);
 
     mosaic[i].Mcal  = stats.mean;
@@ -547 +547 @@
       off_t im = MosaicToImage[i][j];
       image[im].ubercalDist = mosaic[i].ubercalDist;
-      fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
+      // fprintf (stderr, "%d %d %d\n", (int) i, (int) im, image[im].ubercalDist);
     }
   }

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/StarOps.c

@@ -56 +56 @@
   int Nsecfilt = GetPhotcodeNsecfilt ();
   Nfew = Nsys = Nbad = Ncal = Nmos = Ngrid = 0;
-
-  FILE *f = fopen ("few.v1.dat", "w");
 
   for (i = 0; i < Ncatalog; i++) {
@@ -133 +131 @@
         // when performing the grid analysis, STAR_TOOFEW will be set to 1;
         if (N <= STAR_TOOFEW) { /* too few measurements */
-          fprintf (f, "%10.6f %10.6f %d %d %d\n", catalog[i].averageT[j].R, catalog[i].averageT[j].D, catalog[i].measureT[catalog[i].averageT[j].measureOffset].imageID, N, STAR_TOOFEW); 
+          // fprintf (f, "%10.6f %10.6f %d %d %d\n", catalog[i].averageT[j].R, catalog[i].averageT[j].D, catalog[i].measureT[catalog[i].averageT[j].measureOffset].imageID, N, STAR_TOOFEW); 
           catalog[i].secfilt[Nsecfilt*j+Nsec].flags |= ID_STAR_FEW;
           Nfew ++;
@@ -150 +148 @@
     }
   }
-  fclose (f);
   fprintf (stderr, "%d stars marked having too few measurements (Nbad: %d, Ncal: %d, Nmos: %d, Ngrid: %d, Nsys: %d)\n", Nfew, Nbad, Ncal, Nmos, Ngrid, Nsys);
 
@@ -288 +285 @@
         catalog[i].secfilt[Nsecfilt*j+Nsec].Nused = stats.Nmeas;
 
-        catalog[i].secfilt[Nsecfilt*j+Nsec].M_80 = stats.Upper80; // M_80 == ubercalDist
-        catalog[i].secfilt[Nsecfilt*j+Nsec].M_20 = stats.Lower20; // M_80 == ubercalDist
-        catalog[i].secfilt[Nsecfilt*j+Nsec].M_80 = minUbercalDist; // M_80 == ubercalDist
+        catalog[i].secfilt[Nsecfilt*j+Nsec].M_80 = stats.Upper80;
+        catalog[i].secfilt[Nsecfilt*j+Nsec].M_20 = stats.Lower20;
+        catalog[i].secfilt[Nsecfilt*j+Nsec].ubercalDist = minUbercalDist;
       }
     }
@@ -577 +574 @@
   TOOFEW = MAX (5, STAR_TOOFEW);
 
-  FILE *f = final ? fopen ("poor.dat", "a") : fopen ("poor.dat", "w");
-
   Ndel = Nave = 0;
   Ncal = Nmos = Ngrid = Nfew = 0;
@@ -675 +670 @@
           float mySigma = hypot (stats.sigma, dlist[k]);
           if (fabs (list[k] - stats.median) > NSIGMA_REJECT*mySigma) {
-            fprintf (f, "%10.6f %10.6f %d %f %f %f %f 0x%08x\n", catalog[i].averageT[j].R, catalog[i].averageT[j].D, catalog[i].measureT[ilist[k]].imageID, list[k], stats.median, stats.sigma, mySigma, catalog[i].measureT[ilist[k]].photFlags); 
+            // fprintf (f, "%10.6f %10.6f %d %f %f %f %f 0x%08x\n", catalog[i].averageT[j].R, catalog[i].averageT[j].D, catalog[i].measureT[ilist[k]].imageID, list[k], stats.median, stats.sigma, mySigma, catalog[i].measureT[ilist[k]].photFlags); 
             catalog[i].measureT[ilist[k]].dbFlags |= ID_MEAS_POOR_PHOTOM;
             if (final) {
@@ -692 +687 @@
     }
   }
-  fclose (f);
   initstats (STATMODE);
   if (VERBOSE) fprintf (stderr, OFF_T_FMT" measures marked poor, "OFF_T_FMT" total\n", Ndel, Nave);

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/reload_catalogs.c

@@ -104 +104 @@
   }
 
-  fprintf (stderr, "time1  %f : find catalog\n", time1);
-  fprintf (stderr, "time2  %f : load catalog\n", time2);
-  fprintf (stderr, "time3a %f : init imbins\n",  time3a);
-  fprintf (stderr, "time3b %f : init imbins\n",  time3b);
-  fprintf (stderr, "time4  %f : find images\n",  time4);
-  fprintf (stderr, "time5  %f : set Mrel\n",     time5);
-  fprintf (stderr, "time6  %f : save catalog\n", time6);
-  fprintf (stderr, "time7  %f : free catalog\n", time7);
+  fprintf (stderr, "time step 1  %10.3f sec : find catalog\n", time1);
+  fprintf (stderr, "time step 2  %10.3f sec : load catalog\n", time2);
+  fprintf (stderr, "time step 3  %10.3f sec : make tiny values\n", time3a);
+  fprintf (stderr, "time step 4  %10.3f sec : init imbins\n",  time3b);
+  fprintf (stderr, "time step 5  %10.3f sec : find images\n",  time4);
+  fprintf (stderr, "time step 6  %10.3f sec : set Mrel\n",     time5);
+  fprintf (stderr, "time step 7  %10.3f sec : save catalog\n", time6);
+  fprintf (stderr, "time step 8  %10.3f sec : free catalog\n", time7);
 }
 

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/relphot.c

@@ -244 +244 @@
   freeGridBins (Ncatalog);
 
-  // XXX
-  FILE *f = fopen ("poor.dat", "w");
-  fclose (f);
-
   /* load catalog data from region files, update Mrel include all data */
   reload_catalogs (skylist, flatcorr, 0, NULL);

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/setMrelFinal.c

@@ -205 +205 @@
     }
   }
-  if (VERBOSE) fprintf (stderr, "pass %d, Ntot: "OFF_T_FMT", Ntry: "OFF_T_FMT", Nskip: "OFF_T_FMT", Nkeep: "OFF_T_FMT"\n",
+  if (VERBOSE2) fprintf (stderr, "pass %d, Ntot: "OFF_T_FMT", Ntry: "OFF_T_FMT", Nskip: "OFF_T_FMT", Nkeep: "OFF_T_FMT"\n",
                         pass, Ntot, Ntry, Nskip, Nkeep);
 }