[yt-svn] commit/yt: chummels: Merged in ngoldbaum/yt (pull request #2300)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/3def30daea80/
Changeset:   3def30daea80
Branch:      yt
User:        chummels
Date:        2016-07-23 12:49:41+00:00
Summary:     Merged in ngoldbaum/yt (pull request #2300)

Mask out zero temperature data as well as zero density data. Closes #1232
Affected #:  1 file

diff -r 2d8f160304978d5fe9836fa54c80db779bf92f8e -r 3def30daea80724afecc4b301ff3338e64e07cd5 yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
--- a/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
+++ b/yt/analysis_modules/cosmological_observation/light_ray/light_ray.py
@@ -21,6 +21,8 @@
     load
 from yt.frontends.ytdata.utilities import \
     save_as_dataset
+from yt.units.unit_object import \
+    Unit
 from yt.units.yt_array import \
     YTArray
 from yt.utilities.cosmology import \
@@ -603,10 +605,18 @@
         extra_attrs = {"data_type": "yt_light_ray"}
         field_types = dict([(field, "grid") for field in data.keys()])
         # Only return LightRay elements with non-zero density
-        if 'density' in data:
-            mask = data['density'] > 0
-            for key in data.keys():
-                data[key] = data[key][mask]
+        mask_field_units = ['K', 'cm**-3', 'g/cm**3']
+        mask_field_units = [Unit(u) for u in mask_field_units]
+        for f in data:
+            for u in mask_field_units:
+                if data[f].units.same_dimensions_as(u):
+                    mask = data[f] > 0
+                    if not np.any(mask):
+                        raise RuntimeError(
+                            "No zones along light ray with nonzero %s. "
+                            "Please modify your light ray trajectory." % (f,))
+                    for key in data.keys():
+                        data[key] = data[key][mask]
         save_as_dataset(ds, filename, data, field_types=field_types,
                         extra_attrs=extra_attrs)

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.