[Yt-svn] yt: This should fix the log_fields problems. Note that either t...

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/c8a955052039
changeset: 3558:c8a955052039
user:      Sam Skillman <sam.skillman at gmail.com>
date:
Wed Nov 24 02:12:57 2010 -0700
description:
This should fix the log_fields problems.  Note that either take_log=False should be given in the derived field definition or pf.field_info[field].take_log=False should be set.

diffstat:

 yt/utilities/amr_kdtree/amr_kdtree.py |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r 222589d1ed61 -r c8a955052039 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py	Wed Nov 24 01:07:04 2010 -0700
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py	Wed Nov 24 02:12:57 2010 -0700
@@ -251,19 +251,20 @@
             processors.  Reduce number of processors.')
             raise(KeyError)
         if fields is None: fields = ["Density"]
-        self.fields = fields
         self.no_ghost = no_ghost
         reduction_needed = {'domain':False,'depth':True,'breadth':True}
         self.tree_type = tree_type
         self.reduce_tree=reduction_needed[self.tree_type]
         self.bricks_loaded = False
+
+        self.fields = ensure_list(fields)
+        if log_fields is not None:
+            log_fields = ensure_list(log_fields)
+        else:
+            log_fields = [self.pf.field_info[field].take_log
+                         for field in self.fields]
         self.log_fields = log_fields
-        
-        if self.log_fields is None:
-            self.log_field=[]
-            for field in self.fields:
-                self.log_field.append(field in self.pf.field_info and 
-                                      self.pf.field_info[field].take_log)
+
         if l_max is None:
             self.l_max = self.pf.hierarchy.max_level+1
         else:
@@ -344,7 +345,7 @@
                 dds = []
                 for i,field in enumerate(self.fields):
                     vcd = current_node['grid'].get_vertex_centered_data(field,smoothed=True,no_ghost=self.no_ghost).astype('float64')
-                    if self.log_field[i]: vcd = na.log10(vcd)
+                    if self.log_fields[i]: vcd = na.log10(vcd)
                     dds.append(vcd)
                 current_saved_grids.append(current_node['grid'])
                 current_vcds.append(dds)
@@ -750,7 +751,7 @@
                             dds = []
                             for i,field in enumerate(self.fields):
                                 vcd = current_node['grid'].get_vertex_centered_data(field,no_ghost=self.no_ghost).astype('float64')
-                                if self.log_field[i]: vcd = na.log10(vcd)
+                                if self.log_fields[i]: vcd = na.log10(vcd)
                                 dds.append(vcd)
                             self.current_saved_grids.append(current_node['grid'])
                             self.current_vcds.append(dds)