Changeset 35096 for branches/eam_branches/ipp-20121219/Ohana

Timestamp:

Feb 6, 2013, 2:34:49 PM (13 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/getstar/src/select_by_region.c (modified) (3 diffs)
• Ohana/src/libohana/src (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)

branches/eam_branches/ipp-20121219/Ohana/src/getstar/src/select_by_region.c

@@ -53 +53 @@
     gfits_scan (&catalog[0].header, "DEC1", "%lf", 1, &Dmax);
 
-    if (VERBOSE) fprintf (stderr, "extracting from catalog covering region %f,%f to %f,%f\n", Rmin, Dmin, Rmax, Dmax);
-
     AREA = fabs(Dmax - Dmin) * fabs(Rmax - Rmin) * cos (0.5*RAD_DEG*(Dmax + Dmin));
+    if (VERBOSE) fprintf (stderr, "extracting from catalog covering region %f,%f to %f,%f for area %f\n", Rmin, Dmin, Rmax, Dmax, AREA);
     assert (AREA > 0);
 
@@ -83 +82 @@
       if (isnan(mag)) continue;
       if (mag < MinMagValue) continue;
-      if (mag > MagLimitValue) continue;
 
       bin = (mag - MagMin) / dMag;
@@ -101 +99 @@
     }
     MagLimitValue = i*dMag + MagMin;
-    if (VERBOSE) fprintf (stderr, "using %d stars in mag range %f - %f\n", Nsum, MinMagValue, MagLimitValue);
+    if (VERBOSE) fprintf (stderr, "using %d (Nmax %d) stars in mag range %f - %f\n", Nsum, Nmax, MinMagValue, MagLimitValue);
   }