Changeset 27840 for branches/simtest_nebulous_branches/ippScripts/scripts/ds9_cmf_regions.pl

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/ds9_cmf_regions.pl (modified) (3 diffs)

branches/simtest_nebulous_branches/ippScripts/scripts/ds9_cmf_regions.pl

@@ -81 +81 @@
 if ($mag_radius) {
     foreach my $m (@$mag) {
-        next unless defined $m and $m < "inf" and $m > "-inf";
+        next unless defined $m and $m != "nan" and $m < "inf" and $m > "-inf";
         unless (defined $mag_min and defined $mag_max) {
             $mag_min = $m;
@@ -99 +99 @@
 for (my $i = 0; $i < $numRows; $i++) {
     my $col;                    # Colour to use
-    if ($$flags[$i] & $flag) {
+    if ($$flags[$i] & $flag or not defined $$mag[$i] or $$mag[$i] eq "nan" or $$mag[$i] == "inf" or $$mag[$i] == "-inf") {
         $numBad++;
         $col = $flag_colour;
@@ -107 +107 @@
     }
     my $r = $radius;            # Radius of circle
-    next if defined $mag_radius and (not defined $$mag[$i] or $$mag[$i] == "inf" or $$mag[$i] == "-inf");
+    next if $mag_radius and (not defined $$mag[$i] or $$mag[$i] eq "nan" or $$mag[$i] == "inf" or $$mag[$i] == "-inf");
     $r -= ($$mag[$i] - $mag_min) * $radius_scale if defined $mag_radius;
     print $coordFile "image; circle(" . ($$x[$i] + 1) . ',' . ($$y[$i] + 1) . ",$r) \# color = $col\n";