[Yt-svn] yt: 2 new changesets

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/bd305766e2cf
changeset: 3719:bd305766e2cf
user:      Britton Smith <brittonsmith at gmail.com>
date:
Mon Feb 07 13:54:07 2011 -0500
description:
Added species mass fields.

hg Repository: yt
details:   yt/rev/186742302083
changeset: 3720:186742302083
user:      Britton Smith <brittonsmith at gmail.com>
date:
Tue Jan 18 14:03:42 2011 -0500
description:
Removed bins=True from numpy.histrogram call.  This is no longer
supported in numpy >1.4.

diffstat:

 yt/analysis_modules/halo_mass_function/halo_mass_function.py |   2 +-
 yt/frontends/enzo/fields.py                                  |  12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diffs (45 lines):

diff -r 15d793f6c883 -r 186742302083 yt/analysis_modules/halo_mass_function/halo_mass_function.py
--- a/yt/analysis_modules/halo_mass_function/halo_mass_function.py	Sat Feb 05 17:31:03 2011 -0500
+++ b/yt/analysis_modules/halo_mass_function/halo_mass_function.py	Tue Jan 18 14:03:42 2011 -0500
@@ -206,7 +206,7 @@
         bins = na.logspace(self.log_mass_min,
             self.log_mass_max,self.num_sigma_bins)
         avgs = (bins[1:]+bins[:-1])/2.
-        dis, bins = na.histogram(self.haloes,bins,new=True)
+        dis, bins = na.histogram(self.haloes,bins)
         # add right to left
         for i,b in enumerate(dis):
             dis[self.num_sigma_bins-i-3] += dis[self.num_sigma_bins-i-2]
diff -r 15d793f6c883 -r 186742302083 yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py	Sat Feb 05 17:31:03 2011 -0500
+++ b/yt/frontends/enzo/fields.py	Tue Jan 18 14:03:42 2011 -0500
@@ -64,10 +64,15 @@
 def _SpeciesFraction(field, data):
     sp = field.name.split("_")[0] + "_Density"
     return data[sp]/data["Density"]
+def _SpeciesMass(field, data):
+    sp = field.name.split("_")[0] + "_Density"
+    return data[sp] * data["CellVolume"]
 def _SpeciesNumberDensity(field, data):
     species = field.name.split("_")[0]
     sp = field.name.split("_")[0] + "_Density"
     return data[sp]/_speciesMass[species]
+def _convertCellMassMsun(data):
+    return 5.027854e-34 # g^-1
 def _ConvertNumberDensity(data):
     return 1.0/mh
 
@@ -78,6 +83,13 @@
     add_field("Comoving_%s_Density" % species,
              function=_SpeciesComovingDensity,
              validators=ValidateDataField("%s_Density" % species))
+    add_field("%s_Mass" % species, units=r"\rm{g}", 
+              function=_SpeciesMass, 
+              validators=ValidateDataField("%s_Density" % species))
+    add_field("%s_MassMsun" % species, units=r"M_{\odot}", 
+              function=_SpeciesMass, 
+              convert_function=_convertCellMassMsun,
+              validators=ValidateDataField("%s_Density" % species))
     if _speciesMass.has_key(species):
         add_field("%s_NumberDensity" % species,
                   function=_SpeciesNumberDensity,