Changeset 34459

Timestamp:

Sep 21, 2012, 2:51:53 PM (14 years ago)

Author:

bills

Message:

-minmag was not actually being applied. Fix that. Also use the magnitude
limits to cut the stars going into the limits when -maxdensity is
used.

Location:

trunk/Ohana/src/getstar/src

Files:

• args.c (modified) (2 diffs)
• select_by_region.c (modified) (3 diffs)

trunk/Ohana/src/getstar/src/args.c

@@ -40 +40 @@
 
   MagLimitUse = FALSE;
+  MagLimitValue = 100;
   if ((N = get_argument (argc, argv, "-maglim"))) {
     MagLimitUse = TRUE;
@@ -60 +61 @@
 
   MinMagUse = FALSE;
+  MinMagValue = -100;
   if ((N = get_argument (argc, argv, "-minmag"))) {
     MinMagUse = TRUE;

trunk/Ohana/src/getstar/src/select_by_region.c

@@ -82 +82 @@
       }
       if (isnan(mag)) continue;
+      if (mag < MinMagValue) continue;
+      if (mag > MagLimitValue) continue;
 
       bin = (mag - MagMin) / dMag;
@@ -118 +120 @@
     if (D > region[0].Dmax) continue;
 
-    if (MagLimitUse) {
+    // If either magnitude limit was specfied it a apply both.
+    // If one of the limits is not used it is initialized to an unphysical value so test will succeed
+    if (MagLimitUse || MinMagUse) {
       mag = NAN;
       if (needMeas) {
@@ -132 +136 @@
       }
       if (isnan(mag) || (mag > MagLimitValue)) continue;
+      if (isnan(mag) || (mag < MinMagValue)) continue;
     }