[Yt-svn] yt-commit r1544 - branches/yt-1.5/yt/raven trunk/yt/raven

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Tue Nov 24 15:35:35 2009
New Revision: 1544
URL: http://yt.enzotools.org/changeset/1544

Log:
Fixing contour callback for domain boundaries



Modified:
   branches/yt-1.5/yt/raven/Callbacks.py
   trunk/yt/raven/Callbacks.py

Modified: branches/yt-1.5/yt/raven/Callbacks.py
==============================================================================
--- branches/yt-1.5/yt/raven/Callbacks.py	(original)
+++ branches/yt-1.5/yt/raven/Callbacks.py	Tue Nov 24 15:35:35 2009
@@ -227,11 +227,10 @@
         XShifted = copy.copy(plot.data["px"])
         YShifted = copy.copy(plot.data["py"])
         for shift in na.mgrid[-1:1:3j]*DomainWidth:
-            xlim = na.logical_and(plot.data["px"] + shift >= x0*0.9,
-                                  plot.data["px"] + shift <= x1*1.1)
-            ylim = na.logical_and(plot.data["py"] + shift >= y0*0.9,
-                                  plot.data["py"] + shift <= y1*1.1)
-
+            xlim = na.logical_and(plot.data["px"] + shift >= x0,
+                                  plot.data["px"] + shift <= x1)
+            ylim = na.logical_and(plot.data["py"] + shift >= y0,
+                                  plot.data["py"] + shift <= y1)
             XShifted[na.where(xlim)] += shift
             YShifted[na.where(ylim)] += shift
             AllX = na.logical_or(AllX, xlim)

Modified: trunk/yt/raven/Callbacks.py
==============================================================================
--- trunk/yt/raven/Callbacks.py	(original)
+++ trunk/yt/raven/Callbacks.py	Tue Nov 24 15:35:35 2009
@@ -163,10 +163,10 @@
         XShifted = copy.copy(plot.data["px"])
         YShifted = copy.copy(plot.data["py"])
         for shift in na.mgrid[-1:1:3j]*DomainWidth:
-            xlim = na.logical_and(plot.data["px"] + shift >= x0*0.9,
-                                  plot.data["px"] + shift <= x1*1.1)
-            ylim = na.logical_and(plot.data["py"] + shift >= y0*0.9,
-                                  plot.data["py"] + shift <= y1*1.1)
+            xlim = na.logical_and(plot.data["px"] + shift >= x0,
+                                  plot.data["px"] + shift <= x1)
+            ylim = na.logical_and(plot.data["py"] + shift >= y0,
+                                  plot.data["py"] + shift <= y1)
 
             XShifted[na.where(xlim)] += shift
             YShifted[na.where(ylim)] += shift