[yt-svn] commit/yt: MatthewTurk: Converting Orion fields to use NullFunc/TranslationFunc, and removing what I

[Bitbucket]

1 new commit in yt:


https://bitbucket.org/yt_analysis/yt/changeset/b9613e068053/
changeset:   b9613e068053
branch:      yt
user:        MatthewTurk
date:        2012-03-23 11:25:32
summary:     Converting Orion fields to use NullFunc/TranslationFunc, and removing what I
believe is an unnecessary conditional in the FLASH fields.
affected #:  2 files

diff -r 7ff85b5c7dccb9b03225e13658d85209ea07bbc7 -r b9613e068053ec6b24315ee51a540007d68a518f yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -193,17 +193,16 @@
         add_flash_field(v, function=NullFunc, take_log=False,
                   validators = [ValidateDataField(v)],
                   particle_type = pfield)
-    else:
-        if f.endswith("_Fraction") :
-            dname = "%s\/Fraction" % f.split("_")[0]
-        else :
-            dname = f                    
-        ff = KnownFLASHFields[v]
-        pfield = f.startswith("particle")
-        add_field(f, TranslationFunc(v),
-                  take_log=KnownFLASHFields[v].take_log,
-                  units = ff._units, display_name=dname,
-                  particle_type = pfield)
+    if f.endswith("_Fraction") :
+        dname = "%s\/Fraction" % f.split("_")[0]
+    else :
+        dname = f                    
+    ff = KnownFLASHFields[v]
+    pfield = f.startswith("particle")
+    add_field(f, TranslationFunc(v),
+              take_log=KnownFLASHFields[v].take_log,
+              units = ff._units, display_name=dname,
+              particle_type = pfield)
 
 def _convertParticleMassMsun(data):
     return 1.0/1.989e33


diff -r 7ff85b5c7dccb9b03225e13658d85209ea07bbc7 -r b9613e068053ec6b24315ee51a540007d68a518f yt/frontends/orion/fields.py
--- a/yt/frontends/orion/fields.py
+++ b/yt/frontends/orion/fields.py
@@ -29,6 +29,8 @@
     mh, kboltz
 from yt.data_objects.field_info_container import \
     FieldInfoContainer, \
+    NullFunc, \
+    TranslationFunc, \
     FieldInfo, \
     ValidateParameter, \
     ValidateDataField, \
@@ -44,24 +46,24 @@
 OrionFieldInfo = FieldInfoContainer.create_with_fallback(FieldInfo)
 add_field = OrionFieldInfo.add_field
 
-add_orion_field("density", function=lambda a,b: None, take_log=True,
+add_orion_field("density", function=NullFunc, take_log=True,
                 validators = [ValidateDataField("density")],
                 units=r"\rm{g}/\rm{cm}^3")
 KnownOrionFields["density"]._projected_units =r"\rm{g}/\rm{cm}^2"
 
-add_orion_field("eden", function=lambda a,b: None, take_log=True,
+add_orion_field("eden", function=NullFunc, take_log=True,
                 validators = [ValidateDataField("eden")],
                 units=r"\rm{erg}/\rm{cm}^3")
 
-add_orion_field("xmom", function=lambda a,b: None, take_log=False,
+add_orion_field("xmom", function=NullFunc, take_log=False,
                 validators = [ValidateDataField("xmom")],
                 units=r"\rm{g}/\rm{cm^2\ s}")
 
-add_orion_field("ymom", function=lambda a,b: None, take_log=False,
+add_orion_field("ymom", function=NullFunc, take_log=False,
                 validators = [ValidateDataField("ymom")],
                 units=r"\rm{gm}/\rm{cm^2\ s}")
 
-add_orion_field("zmom", function=lambda a,b: None, take_log=False,
+add_orion_field("zmom", function=NullFunc, take_log=False,
                 validators = [ValidateDataField("zmom")],
                 units=r"\rm{g}/\rm{cm^2\ s}")
 
@@ -76,15 +78,14 @@
                     "z-momentum": "zmom"
                    }
 
-def _generate_translation(mine, theirs):
-    add_field(theirs, function=lambda a, b: b[mine], take_log=True)
-
 for f,v in translation_dict.items():
-    if v not in OrionFieldInfo:
-        add_field(v, function=lambda a,b: None, take_log=False,
+    if v not in KnownOrionFields:
+        add_orion_field(v, function=NullFunc, take_log=False,
                   validators = [ValidateDataField(v)])
-    #print "Setting up translator from %s to %s" % (v, f)
-    _generate_translation(v, f)
+    ff = KnownOrionFields[v]
+    add_field(f, TranslationFunc(v),
+              take_log=KnownOrionFields[v].take_log,
+              units = ff._units, display_name=f)
 
 def _xVelocity(field, data):
     """generate x-velocity from x-momentum and density

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.