[yt-svn] commit/yt: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/13263ff71062/
Changeset:   13263ff71062
Branch:      yt
User:        chummels
Date:        2016-12-11 07:49:16+00:00
Summary:     Assuring a number-only unique-id hash is still interpreted as a string in annotate_ray.
Affected #:  2 files

diff -r 078774898c0b14002775f250e6c4dc7930d3b7b0 -r 13263ff71062d76013097e534a2224d2e6deb1de 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
@@ -683,7 +683,7 @@
                     if isinstance(s[f], YTArray):
                         s[f].convert_to_base()
             for key in self.light_ray_solution[0]:
-                if key in ["next", "previous"]:
+                if key in ["next", "previous", "index"]:
                     continue
                 lrsa = [sol[key] for sol in self.light_ray_solution]
                 if isinstance(lrsa[-1], YTArray):

diff -r 078774898c0b14002775f250e6c4dc7930d3b7b0 -r 13263ff71062d76013097e534a2224d2e6deb1de yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -2285,7 +2285,7 @@
         """
 
         for ray_ds in self.ray.light_ray_solution:
-            if ray_ds['unique_identifier'] == plot.ds.unique_identifier:
+            if ray_ds['unique_identifier'] == str(plot.ds.unique_identifier):
                 start_coord = plot.ds.arr(ray_ds['start'])
                 end_coord = plot.ds.arr(ray_ds['end'])
                 return (start_coord, end_coord)


https://bitbucket.org/yt_analysis/yt/commits/ed03447eae86/
Changeset:   ed03447eae86
Branch:      yt
User:        jzuhone
Date:        2016-12-11 16:31:11+00:00
Summary:     Merged in chummels/yt (pull request #2469)

[bugfix] Making sure annotate_ray() works with LightRays
Affected #:  2 files

diff -r bca793ced4fc13d5b9699c9ccf79839412daef11 -r ed03447eae86c5b2dd8d9b1d0eadfed0865d2728 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
@@ -683,7 +683,7 @@
                     if isinstance(s[f], YTArray):
                         s[f].convert_to_base()
             for key in self.light_ray_solution[0]:
-                if key in ["next", "previous"]:
+                if key in ["next", "previous", "index"]:
                     continue
                 lrsa = [sol[key] for sol in self.light_ray_solution]
                 if isinstance(lrsa[-1], YTArray):

diff -r bca793ced4fc13d5b9699c9ccf79839412daef11 -r ed03447eae86c5b2dd8d9b1d0eadfed0865d2728 yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -2285,7 +2285,7 @@
         """
 
         for ray_ds in self.ray.light_ray_solution:
-            if ray_ds['unique_identifier'] == plot.ds.unique_identifier:
+            if ray_ds['unique_identifier'] == str(plot.ds.unique_identifier):
                 start_coord = plot.ds.arr(ray_ds['start'])
                 end_coord = plot.ds.arr(ray_ds['end'])
                 return (start_coord, end_coord)

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.