[Yt-svn] yt-commit r1655 - branches/yt-1.6/yt/lagos trunk/yt/lagos
joishi at wrangler.dreamhost.com
joishi at wrangler.dreamhost.com
Wed Mar 3 16:46:34 PST 2010
Author: joishi
Date: Wed Mar 3 16:46:29 2010
New Revision: 1655
URL: http://yt.enzotools.org/changeset/1655
Log:
corrected display names of scaled versions of radius fields (Radiuspc, Radiusau, and so on) so they all say radius
Modified:
branches/yt-1.6/yt/lagos/UniversalFields.py
trunk/yt/lagos/UniversalFields.py
Modified: branches/yt-1.6/yt/lagos/UniversalFields.py
==============================================================================
--- branches/yt-1.6/yt/lagos/UniversalFields.py (original)
+++ branches/yt-1.6/yt/lagos/UniversalFields.py Wed Mar 3 16:46:29 2010
@@ -195,6 +195,7 @@
just_one(data["CellVolumeCode"].ravel())
# Note that we mandate grid-type here, so this is okay
return particles
+
def _convertParticleMass(data):
return data.convert("Density")*(data.convert("cm")**3.0)
def _IOLevelParticleMass(grid):
@@ -636,7 +637,8 @@
add_field("ParticleRadius", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusCGS, units=r"\rm{cm}",
- particle_type = True)
+ particle_type = True,
+ display_name = "Particle Radius")
add_field("Radius", function=_Radius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusCGS, units=r"\rm{cm}")
@@ -645,57 +647,69 @@
return data.convert("mpc")
add_field("RadiusMpc", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}")
+ convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}",
+ display_name = "Radius")
add_field("ParticleRadiusMpc", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
def _ConvertRadiuskpc(data):
return data.convert("kpc")
add_field("ParticleRadiuskpc", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("Radiuskpc", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}")
+ convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}",
+ display_name = "Radius")
def _ConvertRadiuskpch(data):
return data.convert("kpch")
add_field("ParticleRadiuskpch", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("Radiuskpch", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}")
+ convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}",
+ display_name = "Radius")
def _ConvertRadiuspc(data):
return data.convert("pc")
add_field("ParticleRadiuspc", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiuspc, units=r"\rm{pc}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("Radiuspc", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiuspc, units=r"\rm{pc}")
+ convert_function = _ConvertRadiuspc, units=r"\rm{pc}",
+ display_name="Radius")
def _ConvertRadiusAU(data):
return data.convert("au")
add_field("ParticleRadiusAU", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusAU, units=r"\rm{AU}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("RadiusAU", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiusAU, units=r"\rm{AU}")
+ convert_function = _ConvertRadiusAU, units=r"\rm{AU}",
+ display_name = "Radius")
add_field("ParticleRadiusCode", function=_ParticleRadius,
validators=[ValidateParameter("center")],
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius (code)")
add_field("RadiusCode", function=_Radius,
- validators=[ValidateParameter("center")])
+ validators=[ValidateParameter("center")],
+ display_name = "Radius (code)")
def _RadialVelocity(field, data):
center = data.get_field_parameter("center")
Modified: trunk/yt/lagos/UniversalFields.py
==============================================================================
--- trunk/yt/lagos/UniversalFields.py (original)
+++ trunk/yt/lagos/UniversalFields.py Wed Mar 3 16:46:29 2010
@@ -195,6 +195,7 @@
just_one(data["CellVolumeCode"].ravel())
# Note that we mandate grid-type here, so this is okay
return particles
+
def _convertParticleMass(data):
return data.convert("Density")*(data.convert("cm")**3.0)
def _IOLevelParticleMass(grid):
@@ -636,7 +637,8 @@
add_field("ParticleRadius", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusCGS, units=r"\rm{cm}",
- particle_type = True)
+ particle_type = True,
+ display_name = "Particle Radius")
add_field("Radius", function=_Radius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusCGS, units=r"\rm{cm}")
@@ -645,57 +647,69 @@
return data.convert("mpc")
add_field("RadiusMpc", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}")
+ convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}",
+ display_name = "Radius")
add_field("ParticleRadiusMpc", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusMpc, units=r"\rm{Mpc}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
def _ConvertRadiuskpc(data):
return data.convert("kpc")
add_field("ParticleRadiuskpc", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("Radiuskpc", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}")
+ convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}",
+ display_name = "Radius")
def _ConvertRadiuskpch(data):
return data.convert("kpch")
add_field("ParticleRadiuskpch", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("Radiuskpch", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}")
+ convert_function = _ConvertRadiuskpc, units=r"\rm{kpc}/\rm{h}",
+ display_name = "Radius")
def _ConvertRadiuspc(data):
return data.convert("pc")
add_field("ParticleRadiuspc", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiuspc, units=r"\rm{pc}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("Radiuspc", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiuspc, units=r"\rm{pc}")
+ convert_function = _ConvertRadiuspc, units=r"\rm{pc}",
+ display_name="Radius")
def _ConvertRadiusAU(data):
return data.convert("au")
add_field("ParticleRadiusAU", function=_ParticleRadius,
validators=[ValidateParameter("center")],
convert_function = _ConvertRadiusAU, units=r"\rm{AU}",
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius")
add_field("RadiusAU", function=_Radius,
validators=[ValidateParameter("center")],
- convert_function = _ConvertRadiusAU, units=r"\rm{AU}")
+ convert_function = _ConvertRadiusAU, units=r"\rm{AU}",
+ display_name = "Radius")
add_field("ParticleRadiusCode", function=_ParticleRadius,
validators=[ValidateParameter("center")],
- particle_type=True)
+ particle_type=True,
+ display_name = "Particle Radius (code)")
add_field("RadiusCode", function=_Radius,
- validators=[ValidateParameter("center")])
+ validators=[ValidateParameter("center")],
+ display_name = "Radius (code)")
def _RadialVelocity(field, data):
center = data.get_field_parameter("center")
More information about the yt-svn
mailing list