[Yt-svn] yt-commit r350 - in trunk/yt: lagos raven
mturk at wrangler.dreamhost.com
mturk at wrangler.dreamhost.com
Tue Jan 1 17:18:27 PST 2008
Author: mturk
Date: Tue Jan 1 17:18:26 2008
New Revision: 350
URL: http://yt.spacepope.org/changeset/350
Log:
Fix for units in slices and projections.
Modified:
trunk/yt/lagos/DerivedFields.py
trunk/yt/raven/PlotTypes.py
Modified: trunk/yt/lagos/DerivedFields.py
==============================================================================
--- trunk/yt/lagos/DerivedFields.py (original)
+++ trunk/yt/lagos/DerivedFields.py Tue Jan 1 17:18:26 2008
@@ -240,7 +240,7 @@
def _SoundSpeed(field, data):
return ( data.pf["Gamma"]*data["Pressure"] / \
data["Density"] )**(1.0/2.0)
-add_field("SoundSpeed", units=r"$\rm{cm}/\rm{s}$")
+add_field("SoundSpeed", units=r"\rm{cm}/\rm{s}")
def particle_func(p_field):
def _Particles(field, data):
@@ -268,13 +268,13 @@
return ( data["x-velocity"]**2.0 + \
data["y-velocity"]**2.0 + \
data["z-velocity"]**2.0 )**(1.0/2.0)
-add_field("VelocityMagnitude", take_log=False, units=r"$\rm{cm}/\rm{s}$")
+add_field("VelocityMagnitude", take_log=False, units=r"\rm{cm}/\rm{s}")
def _Pressure(field, data):
"""M{(Gamma-1.0)*rho*E}"""
return (data.pf["Gamma"] - 1.0) * \
data["Density"] * data["ThermalEnergy"]
-add_field("Pressure", units=r"$\rm{dyne}/\rm{cm}^{2}$")
+add_field("Pressure", units=r"\rm{dyne}/\rm{cm}^{2}")
def _ThermalEnergy(field, data):
if data.pf["HydroMethod"] == 2:
@@ -287,7 +287,7 @@
data["x-velocity"]**2.0
+ data["y-velocity"]**2.0
+ data["z-velocity"]**2.0 )
-add_field("ThermalEnergy", units=r"$\rm{ergs}/\rm{g}$")
+add_field("ThermalEnergy", units=r"\rm{ergs}/\rm{g}")
def _Entropy(field, data):
return data["Density"]**(-2./3.) * \
@@ -309,7 +309,7 @@
t_dyn_coeff = (3*pi/(16*G))**0.5 \
* data.convert("Time")
return t_dyn_coeff
-add_field("DynamicalTime", units=r"$\rm{s}$",
+add_field("DynamicalTime", units=r"\rm{s}",
convert_function=_ConvertDynamicalTime)
def _NumberDensity(field, data):
@@ -338,15 +338,15 @@
return fieldData
def _ConvertNumberDensity(data):
return 1.0/mh
-add_field("NumberDensity", units=r"$\rm{cm}^{-3}$",
+add_field("NumberDensity", units=r"\rm{cm}^{-3}",
convert_function=_ConvertNumberDensity)
def _CellMass(field, data):
return data["Density"] * data["CellVolume"]
def _convertCellMassMsun(data):
return 5.027854e-34 # g^-1
-add_field("CellMass", units=r"$\rm{g}$")
-add_field("CellMassMsun", units=r"$M_{\odot}$",
+add_field("CellMass", units=r"\rm{g}")
+add_field("CellMassMsun", units=r"M_{\odot}",
function=_CellMass,
convert_function=_convertCellMassMsun)
@@ -359,12 +359,12 @@
return data.convert("mpc")**3.0
def _ConvertCellVolumeCGS(data):
return data.convert("cm")**3.0
-add_field("CellVolumeCode", units=r"$\rm{BoxVolume}^3$",
+add_field("CellVolumeCode", units=r"\rm{BoxVolume}^3",
function=_CellVolume)
-add_field("CellVolumeMpc", units=r"$\rm{Mpc}^3$",
+add_field("CellVolumeMpc", units=r"\rm{Mpc}^3",
function=_CellVolume,
convert_function=_ConvertCellVolumeMpc)
-add_field("CellVolume", units=r"$\rm{cm}^3$",
+add_field("CellVolume", units=r"\rm{cm}^3",
function=_CellVolume,
convert_function=_ConvertCellVolumeCGS)
@@ -429,7 +429,7 @@
return data.convert("cm")**-1.0
add_field("DivV", validators=[ValidateSpatial(1,
["x-velocity","y-velocity","z-velocity"])],
- units=r"$\rm{s}^{-1}$",
+ units=r"\rm{s}^{-1}",
convert_function=_convertDivV)
def _Radius(field, data):
@@ -441,7 +441,7 @@
def _ConvertRadius(data):
return data.convert("cm")
add_field("Radius", validators=[ValidateParameter("center")],
- convert_function = _ConvertRadius, units=r"$\rm{cm}$")
+ convert_function = _ConvertRadius, units=r"\rm{cm}")
add_field("RadiusCode", function=_Radius,
validators=[ValidateParameter("center")])
@@ -459,11 +459,11 @@
def _ConvertRadialVelocityCGS(data):
return (data.convert("x-velocity"))
add_field("RadialVelocity", function=_RadialVelocity,
- convert_function=_ConvertRadialVelocity, units=r"$\rm{km}/\rm{s}$",
+ convert_function=_ConvertRadialVelocity, units=r"\rm{km}/\rm{s}",
validators=[ValidateParameter("center"),
ValidateParameter("bulk_velocity")])
add_field("RadialVelocityCGS", function=_RadialVelocity,
- convert_function=_ConvertRadialVelocityCGS, units=r"$\rm{cm}/\rm{s}$",
+ convert_function=_ConvertRadialVelocityCGS, units=r"\rm{cm}/\rm{s}",
validators=[ValidateParameter("center"),
ValidateParameter("bulk_velocity")])
@@ -479,7 +479,7 @@
return _fieldFunction
for field in _enzo_fields:
add_field(field, function=lambda a, b: None, take_log=True,
- validators=[ValidateDataField(field)], units=r"$\rm{g}/\rm{cm}^3$")
+ validators=[ValidateDataField(field)], units=r"\rm{g}/\rm{cm}^3")
add_field("_Code%s" % field, function=_returnCodeField(field),
take_log=True, validators=[ValidateDataField(field)])
@@ -488,26 +488,26 @@
def _convertDensity(data):
return data.convert("Density")
for field in ["Density"] + [ "%s_Density" % sp for sp in _speciesList ]:
- fieldInfo[field]._units = r"$\rm{g}/\rm{cm}^3$"
- fieldInfo[field]._projected_units = r"$\rm{g}/\rm{cm}^2$"
+ fieldInfo[field]._units = r"\rm{g}/\rm{cm}^3"
+ fieldInfo[field]._projected_units = r"\rm{g}/\rm{cm}^2"
fieldInfo[field]._convert_function=_convertDensity
def _convertEnergy(data):
return data.convert("x-velocity")**2.0
-fieldInfo["Gas_Energy"].units = r"$\rm{ergs}/\rm{g}$"
+fieldInfo["Gas_Energy"].units = r"\rm{ergs}/\rm{g}"
fieldInfo["Gas_Energy"]._convert_function = _convertEnergy
-fieldInfo["Total_Energy"].units = r"$\rm{ergs}/\rm{g}$"
+fieldInfo["Total_Energy"].units = r"\rm{ergs}/\rm{g}"
fieldInfo["Total_Energy"]._convert_function = _convertEnergy
def _convertVelocity(data):
return data.convert("x-velocity")
for ax in ['x','y','z']:
f = fieldInfo["%s-velocity" % ax]
- f.units = r"$\rm{km}/\rm{s}$"
+ f.units = r"\rm{km}/\rm{s}"
f._convert_function = _convertVelocity
f.take_log = False
-fieldInfo["Temperature"].units = r"$K$"
+fieldInfo["Temperature"].units = r"K"
if __name__ == "__main__":
k = fieldInfo.keys()
Modified: trunk/yt/raven/PlotTypes.py
==============================================================================
--- trunk/yt/raven/PlotTypes.py (original)
+++ trunk/yt/raven/PlotTypes.py Tue Jan 1 17:18:26 2008
@@ -378,19 +378,27 @@
self.colorbar.set_label(self.datalabel)
return
field_name = self.axis_names["Z"]
+ data_label = r"$\rm{%s}" % field_name
if lagos.fieldInfo.has_key(field_name):
- field_name += " (%s)" % (lagos.fieldInfo[field_name].get_units())
- if self.colorbar != None: self.colorbar.set_label(field_name)
+ data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_units())
+ data_label += r"$"
+ print field_name, data_label
+ if self.colorbar != None: self.colorbar.set_label(data_label)
class ProjectionPlot(VMPlot):
_type_name = "Projection"
def autoset_label(self):
- dataLabel = self.axis_names["Z"]
+ if self.datalabel != None:
+ self.colorbar.set_label(self.datalabel)
+ return
field_name = self.axis_names["Z"]
+ data_label = r"$\rm{%s}" % field_name
if lagos.fieldInfo.has_key(field_name):
- field_name += " (%s)" % (lagos.fieldInfo[field_name].get_projected_units())
- if self.colorbar != None: self.colorbar.set_label(field_name)
+ data_label += r"\/\/ (%s)" % (lagos.fieldInfo[field_name].get_projected_units())
+ data_label += r"$"
+ print field_name, data_label
+ if self.colorbar != None: self.colorbar.set_label(data_label)
def __getitem__(self, item):
return self.data[item] * \
@@ -474,9 +482,10 @@
return log_field, v, bins
def autoset_label(self, field, func):
- dataLabel = field
+ dataLabel = r"$\rm{%s}" % (field)
if lagos.fieldInfo.has_key(field):
- dataLabel += " (%s)" % (lagos.fieldInfo[field].get_units())
+ dataLabel += r" (%s)" % (lagos.fieldInfo[field].get_units())
+ dataLabel += r"$"
func(dataLabel)
def set_cmap(self, cmap):
More information about the yt-svn
mailing list