Changeset 39345 for trunk

Timestamp:

Feb 12, 2016, 9:22:46 AM (10 years ago)

Author:

eugene

Message:

add test image option

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (4 diffs)
• src/args.c (modified) (3 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -266 +266 @@
 int    VERBOSE;
 int    VERBOSE2;
+int    VERBOSE_IMAGE;
 int    MOSAIC_ZEROPT;
+
+int    TEST_IMAGE;
 
 int    NLOOP;

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -694 +694 @@
       minUbercalDist = MIN (catalog[c].secfilt[n*Nsecfilt + Nsec].ubercalDist, minUbercalDist);
 
-      // fprintf (stderr, "%1d, %3d : %3d, %3d : %10.6f %10.6f : %6.3f  %6.3f  %6.3f  %6.3f  %6.3f\n", (int) i, (int) j, (int) c, (int) m, catalog[c].averageT[n].R, catalog[c].averageT[n].D, Msys, Mrel, Mmos, Mgrid, Mflat);
-
     skip:
       list[N] = Msys - Mrel - Mmos - Mgrid + Mflat;
@@ -703 +701 @@
       }
 
+      if (image[i].imageID == TEST_IMAGE) {
+        fprintf (stderr, "%1d, %3d : %3d, %3d : %10.6f %10.6f : %6.3f  %6.3f  %6.3f  %6.3f  %6.3f : %6.3f\n", (int) i, (int) j, (int) c, (int) m, catalog[c].averageT[n].R, catalog[c].averageT[n].D, Msys, Mrel, Mmos, Mgrid, Mflat, list[N]);
+      }
+
       if (catalog[c].measureT[m].dM < IMFIT_SYS_SIGMA_LIM) {
         Mlist[Nbright] = list[N];
@@ -715 +717 @@
 
     /* too few good measurements or too many bad measurements */
+    mark = FALSE;
     if (!PoorImages) {
       mark = (N < IMAGE_TOOFEW) || (N < IMAGE_GOOD_FRACTION*N_onImage[i]);
@@ -732 +735 @@
     image[i].Xm    = 100.0*log10(stats.chisq);
     Ncalibrated ++;
+
+    if (image[i].imageID == TEST_IMAGE) {
+      fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].Mcal, image[i].dMcal);
+    }
+
+    if (!mark && VERBOSE_IMAGE) {
+      fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].Mcal, image[i].dMcal);
+    }
 
     if (PLOTSTUFF) {

trunk/Ohana/src/relphot/src/args.c

@@ -86 +86 @@
   }
 
+  VERBOSE_IMAGE = FALSE;
+  if ((N = get_argument (argc, argv, "-vim"))) {
+    VERBOSE_IMAGE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
   NTHREADS = 0;
   if ((N = get_argument (argc, argv, "-threads"))) {
@@ -167 +173 @@
     remove_argument (N, &argc, argv);
     NGRID = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  TEST_IMAGE = -1;
+  if ((N = get_argument (argc, argv, "-test-image"))) {
+    remove_argument (N, &argc, argv);
+    TEST_IMAGE = atoi(argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -568 +581 @@
   }
 
+  TEST_IMAGE = -1;
+
   RESET = FALSE;
   if ((N = get_argument (argc, argv, "-reset"))) {