[yt-svn] commit/yt: xarthisius: Merged in xarthisius/yt (pull request #2050)

[commits-noreply at bitbucket.org]

1 new commit in yt:

http://link.bitbucket.org/wf/click?upn=8USRlNyft-2BCzk2l4Ywl6gDx2lD2xxoS9E7MwXb2SMR-2BXcTD42YocdnOFkyGBVHOUIFpOw6179iPyd0XBahwECY-2Fd9rjihXbln-2B-2FdjAD6I4Q-3D_ll4ctv0L-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27AXQoSxB9KkrrweNZEmKo2lTVYtR6Fubw6jCf0U1sWq-2Bj5zdCtaR2vYBwaoly77YjsYpPW7131JB7Ryk5dsFAhY3WHLWbR23ZIJOt5M-2FAdylj51xR-2Bn4THpl-2FX1Wnup5DF9Sk3-2F7n-2FcQ4ZzibPH1PwuafW9fFxtDUn1NRxiTmOWX9DFE4yxi-2Fvaj6aTTngH-2FSA-3D
Changeset:   b6563d32400e
Branch:      yt
User:        xarthisius
Date:        2016-03-23 19:31:01+00:00
Summary:     Merged in xarthisius/yt (pull request #2050)

[bugfix] Initialize sampler's camera_data using proper units
Affected #:  2 files

diff -r 1db948002e4548dd500f04ccbad4f0a7cff3d287 -r b6563d32400e520b26ccbb6793998537d91e61af yt/utilities/lib/grid_traversal.pyx
--- a/yt/utilities/lib/grid_traversal.pyx
+++ b/yt/utilities/lib/grid_traversal.pyx
@@ -279,6 +279,8 @@
         vertex[1] = corners[1][iv]
         vertex[2] = corners[2][iv]
 
+        cam_width[1] = cam_width[0] * image.nv[1] / image.nv[0]
+
         subtract(vertex, cam_pos, sight_vector)
         fma(cam_width[2], normal_vector, cam_pos, sight_center)
 

diff -r 1db948002e4548dd500f04ccbad4f0a7cff3d287 -r b6563d32400e520b26ccbb6793998537d91e61af yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -280,8 +280,10 @@
     def _get_sampler_params(self, render_source):
         lens_params = self.lens._get_sampler_params(self, render_source)
         lens_params.update(width=self.width)
+        pos = self.position.in_units("code_length").d
+        width = self.width.in_units("code_length").d
         lens_params.update(camera_data=np.vstack(
-            (self.position.d, self.width.d, self.unit_vectors.d)))
+            (pos, width, self.unit_vectors.d)))
         return lens_params
 
     def set_lens(self, lens_type):

Repository URL: http://link.bitbucket.org/wf/click?upn=8USRlNyft-2BCzk2l4Ywl6gDx2lD2xxoS9E7MwXb2SMR-2BI0v8SbQq-2B8-2FZaaHaJT85r_ll4ctv0L-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27AXQoSxB9KkrrweNZEmKo2lTVYtR6Fubw6jCf0U1sWq-2BrMTQKNxi-2BEc6n2aodbNrBpOH812MJsWRWpUEzykwcco9M-2Bcm3Ayr-2BcG2fqUsVT2Nx-2BYW67pdCo8GJBcOReXDjR3LYHNyKNfEfq-2F-2BnXkMj1Ml-2BqJjO09-2Fi-2BiFx5czCnwiJ6OHyhB7A3kTPsQ4q4NAyE-3D

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160323/d61e0032/attachment.htm>