[yt-svn] commit/yt-3.0: MatthewTurk: Fixing some bad merge artifacts.

[Bitbucket]

1 new commit in yt-3.0:


https://bitbucket.org/yt_analysis/yt-3.0/changeset/9c3604cacb70/
changeset:   9c3604cacb70
branch:      yt-3.0
user:        MatthewTurk
date:        2012-10-04 20:06:56
summary:     Fixing some bad merge artifacts.
affected #:  2 files

diff -r 28d77cb4f4ee34835a9366386a68e3f8a63789c7 -r 9c3604cacb70097baec726c60096b5968b8f971d yt/data_objects/grid_patch.py
--- a/yt/data_objects/grid_patch.py
+++ b/yt/data_objects/grid_patch.py
@@ -374,7 +374,7 @@
         self._child_index_mask = None
 
     #@time_execution
-    def __fill_child_mask(self, child, mask, tofill):
+    def __fill_child_mask(self, child, mask, tofill, dlevel = 1):
         rf = self.pf.refine_by
         if dlevel != 1:
             rf = rf**dlevel


diff -r 28d77cb4f4ee34835a9366386a68e3f8a63789c7 -r 9c3604cacb70097baec726c60096b5968b8f971d yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -782,6 +782,10 @@
             except ParseFatalException, err:
                 raise YTCannotParseUnitDisplayName(f, md['units'],str(err))
 
+            if md['units'] == None or md['units'] == '':
+                label = field_name
+            else:
+                label = field_name+r'$\/\/('+md['units']+r')$'
 
             self.plots[f].cb.set_label(label)
 
@@ -856,6 +860,7 @@
             weight = self.data_source.weight_field
         names = []
         for k, v in self.plots.iteritems():
+            if isinstance(k, types.TupleType): k = k[1]
             if axis:
                 n = "%s_%s_%s_%s" % (name, type, axis, k)
             else:
@@ -863,7 +868,7 @@
                 n = "%s_%s_%s" % (name, type, k)
             if weight:
                 n += "_%s" % (weight)
-            names.append(v.save(n))
+            names.append(v.save(n, mpl_kwargs))
         return names
 
     def _send_zmq(self):

Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.