[Yt-svn] yt-commit r1682 - in branches/yt-1.6/yt: lagos raven

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Wed Apr  7 15:44:16 2010
New Revision: 1682
URL: http://yt.enzotools.org/changeset/1682

Log:
Backporting r1681 to stable branch



Modified:
   branches/yt-1.6/yt/lagos/DerivedQuantities.py
   branches/yt-1.6/yt/raven/PlotCollection.py

Modified: branches/yt-1.6/yt/lagos/DerivedQuantities.py
==============================================================================
--- branches/yt-1.6/yt/lagos/DerivedQuantities.py	(original)
+++ branches/yt-1.6/yt/lagos/DerivedQuantities.py	Wed Apr  7 15:44:16 2010
@@ -372,8 +372,8 @@
     p1 = p.sum()
     if na.any(na.isnan(p)): raise ValueError
     return p1 * (length_scale_factor / (mass_scale_factor**2.0))
-    
-def _Extrema(data, fields, filter=None):
+
+def _Extrema(data, fields, non_zero = False, filter=None):
     """
     This function returns the extrema of a set of fields
     
@@ -389,12 +389,18 @@
             maxs.append(-1e90)
             continue
         if filter is None:
-            mins.append(data[field].min())
-            maxs.append(data[field].max())
+            # Note that we're hijacking an argument here
+            if non_zero: filter = data[field]>0.0
+            mins.append(data[field][filter].min())
+            maxs.append(data[field][filter].max())
         else:
             if this_filter.any():
-                mins.append(data[field][this_filter].min())
-                maxs.append(data[field][this_filter].max())
+                if non_zero:
+                    nz_filter = ((this_filter) &
+                                 (data[field][this_filter] > 0.0))
+                else: nz_filter = this_filter
+                mins.append(data[field][nz_filter].min())
+                maxs.append(data[field][nz_filter].max())
             else:
                 mins.append(1e90)
                 maxs.append(-1e90)

Modified: branches/yt-1.6/yt/raven/PlotCollection.py
==============================================================================
--- branches/yt-1.6/yt/raven/PlotCollection.py	(original)
+++ branches/yt-1.6/yt/raven/PlotCollection.py	Wed Apr  7 15:44:16 2010
@@ -340,7 +340,8 @@
         """
         if x_bounds is None:
             x_min, x_max = data_source.quantities["Extrema"](
-                            fields[0], lazy_reader=lazy_reader)[0]
+                            fields[0], non_zero = x_log,
+                            lazy_reader=lazy_reader)[0]
         else:
             x_min, x_max = x_bounds
         profile = lagos.BinnedProfile1D(data_source,
@@ -389,12 +390,14 @@
         """
         if x_bounds is None:
             x_min, x_max = data_source.quantities["Extrema"](
-                                    fields[0], lazy_reader=lazy_reader)[0]
+                                    fields[0], non_zero = x_log,
+                                    lazy_reader=lazy_reader)[0]
         else:
             x_min, x_max = x_bounds
         if y_bounds is None:
             y_min, y_max = data_source.quantities["Extrema"](
-                                    fields[1], lazy_reader=lazy_reader)[0]
+                                    fields[1], non_zero = y_log,
+                                    lazy_reader=lazy_reader)[0]
         else:
             y_min, y_max = y_bounds
         profile = lagos.BinnedProfile2D(data_source,