[Yt-svn] yt-commit r412 - in trunk/yt: lagos raven

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Fri Apr 25 08:19:07 2008
New Revision: 412
URL: http://yt.spacepope.org/changeset/412

Log:
I think this fixes #73, but I am going to check it later today.  I think that
having the conversion be done in the display layer was lazy, inappropriate, and
not the right thing to do.  Additionally, since we are now supporting
EnzoProjNew outputs, this had to go!



Modified:
   trunk/yt/lagos/BaseDataTypes.py
   trunk/yt/lagos/DerivedFields.py
   trunk/yt/raven/PlotTypes.py

Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py	(original)
+++ trunk/yt/lagos/BaseDataTypes.py	Fri Apr 25 08:19:07 2008
@@ -704,6 +704,7 @@
                 dl = 1.0
                 if field in fieldInfo and fieldInfo[field].line_integral:
                     dl = just_one(grid['d%s' % axis_names[self.axis]])
+                    dl *= self.pf.units[fieldInfo[field].projection_conversion]
                 g_fields[fi] *= dl
             self.__retval_coords[grid.id] = g_coords
             self.__retval_fields[grid.id] = g_fields

Modified: trunk/yt/lagos/DerivedFields.py
==============================================================================
--- trunk/yt/lagos/DerivedFields.py	(original)
+++ trunk/yt/lagos/DerivedFields.py	Fri Apr 25 08:19:07 2008
@@ -275,7 +275,7 @@
 
 def _Ones(field, data):
     return na.ones(data.ActiveDimensions, dtype='float64')
-add_field("Ones", validators=[ValidateSpatial(0)])
+add_field("Ones", validators=[ValidateSpatial(0)], projection_conversion="1")
 add_field("CellsPerBin", function=_Ones, validators=[ValidateSpatial(0)])
 
 def _SoundSpeed(field, data):

Modified: trunk/yt/raven/PlotTypes.py
==============================================================================
--- trunk/yt/raven/PlotTypes.py	(original)
+++ trunk/yt/raven/PlotTypes.py	Fri Apr 25 08:19:07 2008
@@ -393,17 +393,6 @@
         data_label += r"$"
         if self.colorbar != None: self.colorbar.set_label(data_label)
 
-    def __getitem__(self, item):
-        if lagos.fieldInfo.has_key(item):
-            if not lagos.fieldInfo[item].line_integral:
-                dl = 1.0
-            else:
-                dl = self.data.hierarchy.parameter_file.units[
-                    lagos.fieldInfo[item].projection_conversion]
-        else:
-            dl = self.data.hierarchy.parameter_file.units["cm"]
-        return self.data[item] * dl
-
 class CuttingPlanePlot(SlicePlot):
     _type_name = "CuttingPlane"
     def _get_buff(self):
@@ -487,7 +476,7 @@
         if lagos.fieldInfo.has_key(field):
             dataLabel += r" (%s)" % (lagos.fieldInfo[field].get_units())
         dataLabel += r"$"
-        func(dataLabel)
+        func(str(dataLabel))
 
     def set_cmap(self, cmap):
         RavenPlot.set_cmap(self, cmap)