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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/0486b1e10e4f/
Changeset:   0486b1e10e4f
Branch:      yt
User:        samskillman
Date:        2013-07-01 17:27:29
Summary:     Quick fix to not let map_to_colormap get an out of bounds error.
Affected #:  1 file

diff -r 74891da30e86ad33ecad7614e1e10e832ff9bab2 -r 0486b1e10e4f0cfd0bcc10c92562ec106dae3d8d yt/visualization/volume_rendering/transfer_functions.py
--- a/yt/visualization/volume_rendering/transfer_functions.py
+++ b/yt/visualization/volume_rendering/transfer_functions.py
@@ -641,6 +641,8 @@
             self.x_bounds[0]))
         rel1 = int(self.nbins*(ma - self.x_bounds[0])/(self.x_bounds[1] -
             self.x_bounds[0]))
+        rel0 = max(rel0, 0)
+        rel1 = min(rel1, self.nbins-1)
         tomap = np.linspace(0.,1.,num=rel1-rel0)
         cmap = get_cmap(colormap)
         cc = cmap(tomap)


https://bitbucket.org/yt_analysis/yt/commits/1b51d03f4df7/
Changeset:   1b51d03f4df7
Branch:      yt
User:        ngoldbaum
Date:        2013-07-04 03:14:17
Summary:     Merged in samskillman/yt (pull request #540)

Quick fix to not let map_to_colormap get an out of bounds error.
Affected #:  1 file

diff -r f07ee507cefed300665d0c39435245a9fc299ddf -r 1b51d03f4df7744e1bf44c0d429dd876785164a0 yt/visualization/volume_rendering/transfer_functions.py
--- a/yt/visualization/volume_rendering/transfer_functions.py
+++ b/yt/visualization/volume_rendering/transfer_functions.py
@@ -641,6 +641,8 @@
             self.x_bounds[0]))
         rel1 = int(self.nbins*(ma - self.x_bounds[0])/(self.x_bounds[1] -
             self.x_bounds[0]))
+        rel0 = max(rel0, 0)
+        rel1 = min(rel1, self.nbins-1)
         tomap = np.linspace(0.,1.,num=rel1-rel0)
         cmap = get_cmap(colormap)
         cc = cmap(tomap)

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.