[yt-svn] commit/yt: jzuhone: Merged in chummels/yt (pull request #2469)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Sun Dec 11 08:31:37 PST 2016
1 new commit in yt:
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.
More information about the yt-svn
mailing list