[yt-svn] commit/yt: ngoldbaum: Merged in MatthewTurk/yt/yt-3.0 (pull request #924)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon May 26 13:59:07 PDT 2014
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/commits/3cfb38afe34d/
Changeset: 3cfb38afe34d
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-26 22:58:58
Summary: Merged in MatthewTurk/yt/yt-3.0 (pull request #924)
Fix the izip/zip issue, and add a new colormap.
Affected #: 2 files
diff -r aef63614854a28effe3680c931e5b6d26475474f -r 3cfb38afe34da0d502ee9ddfb303426dfe9e053e yt/visualization/_colormap_data.py
--- a/yt/visualization/_colormap_data.py
+++ b/yt/visualization/_colormap_data.py
@@ -1,5 +1,6 @@
### Auto-generated colormap tables, taken from Matplotlib ###
+import numpy as np
from numpy import array
color_map_luts = {}
@@ -7757,6 +7758,64 @@
1.0, 1.0, 1.0, 1.0, 1.0, 1.0]),
)
+color_map_luts["doom"] = (
+array([
+ 0, 31, 23, 75, 255, 27, 19, 11, 7, 47, 35, 23, 15, 79, 71, 63,
+ 255, 247, 243, 235, 231, 223, 219, 211, 203, 199, 191, 187, 179, 175, 167, 163,
+ 155, 151, 143, 139, 131, 127, 119, 115, 107, 103, 95, 91, 83, 79, 71, 67,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 247, 239, 231, 223, 215, 207, 203,
+ 191, 179, 171, 163, 155, 143, 135, 127, 119, 107, 95, 83, 75, 63, 51, 43,
+ 239, 231, 223, 219, 211, 203, 199, 191, 183, 179, 171, 167, 159, 151, 147, 139,
+ 131, 127, 119, 111, 107, 99, 91, 87, 79, 71, 67, 59, 55, 47, 39, 35,
+ 119, 111, 103, 95, 91, 83, 75, 67, 63, 55, 47, 39, 31, 23, 19, 11,
+ 191, 183, 175, 167, 159, 155, 147, 139, 131, 123, 119, 111, 103, 95, 87, 83,
+ 159, 143, 131, 119, 103, 91, 79, 67, 123, 111, 103, 91, 83, 71, 63, 55,
+ 255, 235, 215, 195, 175, 155, 135, 115, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 239, 227, 215, 203, 191, 179, 167, 155, 139, 127, 115, 103, 91, 79, 67,
+ 231, 199, 171, 143, 115, 83, 55, 27, 0, 0, 0, 0, 0, 0, 0, 0,
+ 255, 255, 255, 255, 255, 255, 255, 255, 243, 235, 223, 215, 203, 195, 183, 175,
+ 255, 255, 255, 255, 255, 255, 255, 255, 167, 159, 147, 135, 79, 67, 55, 47,
+ 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 207, 159, 111,
+ 167]) / 255.0,
+array([
+ 0, 23, 15, 75, 255, 27, 19, 11, 7, 55, 43, 31, 23, 59, 51, 43,
+ 183, 171, 163, 151, 143, 135, 123, 115, 107, 99, 91, 87, 79, 71, 63, 59,
+ 51, 47, 43, 35, 31, 27, 23, 19, 15, 11, 7, 7, 7, 0, 0, 0,
+ 235, 227, 219, 211, 207, 199, 191, 187, 179, 171, 163, 155, 147, 139, 131, 127,
+ 123, 115, 111, 107, 99, 95, 87, 83, 79, 71, 67, 63, 55, 47, 43, 35,
+ 239, 231, 223, 219, 211, 203, 199, 191, 183, 179, 171, 167, 159, 151, 147, 139,
+ 131, 127, 119, 111, 107, 99, 91, 87, 79, 71, 67, 59, 55, 47, 39, 35,
+ 255, 239, 223, 207, 191, 175, 159, 147, 131, 115, 99, 83, 67, 51, 35, 23,
+ 167, 159, 151, 143, 135, 127, 123, 115, 107, 99, 95, 87, 83, 75, 67, 63,
+ 131, 119, 107, 95, 83, 71, 59, 51, 127, 115, 107, 99, 87, 79, 71, 63,
+ 255, 219, 187, 155, 123, 91, 67, 43, 255, 219, 187, 155, 123, 95, 63, 31,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 231, 199, 171, 143, 115, 83, 55, 27, 0, 0, 0, 0, 0, 0, 0, 0,
+ 255, 235, 215, 199, 179, 163, 143, 127, 115, 111, 103, 95, 87, 79, 71, 67,
+ 255, 255, 255, 255, 255, 255, 255, 255, 63, 55, 47, 35, 59, 47, 35, 27,
+ 0, 0, 0, 0, 0, 0, 0, 0, 159, 231, 123, 0, 0, 0, 0,
+ 107]) / 255.0,
+array([
+ 0, 11, 7, 75, 255, 27, 19, 11, 7, 31, 15, 7, 0, 43, 35, 27,
+ 183, 171, 163, 151, 143, 135, 123, 115, 107, 99, 91, 87, 79, 71, 63, 59,
+ 51, 47, 43, 35, 31, 27, 23, 19, 15, 11, 7, 7, 7, 0, 0, 0,
+ 223, 211, 199, 187, 179, 167, 155, 147, 131, 123, 115, 107, 99, 91, 83, 79,
+ 75, 71, 67, 63, 59, 55, 51, 47, 43, 39, 35, 31, 27, 23, 19, 15,
+ 239, 231, 223, 219, 211, 203, 199, 191, 183, 179, 171, 167, 159, 151, 147, 139,
+ 131, 127, 119, 111, 107, 99, 91, 87, 79, 71, 67, 59, 55, 47, 39, 35,
+ 111, 103, 95, 87, 79, 71, 63, 55, 47, 43, 35, 27, 23, 15, 11, 7,
+ 143, 135, 127, 119, 111, 107, 99, 91, 87, 79, 75, 67, 63, 55, 51, 47,
+ 99, 83, 75, 63, 51, 43, 35, 27, 99, 87, 79, 71, 59, 51, 43, 39,
+ 115, 87, 67, 47, 31, 19, 7, 0, 255, 219, 187, 155, 123, 95, 63, 31,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 227, 203, 179, 155, 131, 107, 83,
+ 255, 219, 187, 155, 123, 91, 59, 27, 23, 15, 15, 11, 7, 0, 0, 0,
+ 255, 215, 179, 143, 107, 71, 35, 0, 0, 0, 0, 0, 39, 27, 19, 11,
+ 83, 71, 59, 47, 35, 23, 11, 0, 67, 75, 255, 255, 207, 155, 107,
+ 107]) / 255.0,
+np.ones(256),
+)
+
color_map_luts['B-W LINEAR'] = color_map_luts['idl00']
color_map_luts['BLUE'] = color_map_luts['idl01']
color_map_luts['GRN-RED-BLU-WHT'] = color_map_luts['idl02']
diff -r aef63614854a28effe3680c931e5b6d26475474f -r 3cfb38afe34da0d502ee9ddfb303426dfe9e053e yt/visualization/color_maps.py
--- a/yt/visualization/color_maps.py
+++ b/yt/visualization/color_maps.py
@@ -145,12 +145,12 @@
add_cmap("cubehelix", _cubehelix_data)
# Add colormaps in _colormap_data.py that weren't defined here
-_vs = np.linspace(0,1,255)
+_vs = np.linspace(0,1,256)
for k,v in _cm.color_map_luts.iteritems():
if k not in yt_colormaps and k not in mcm.cmap_d:
- cdict = { 'red': izip(_vs,v[0],v[0]),
- 'green': izip(_vs,v[1],v[1]),
- 'blue': izip(_vs,v[2],v[2]) }
+ cdict = { 'red': zip(_vs,v[0],v[0]),
+ 'green': zip(_vs,v[1],v[1]),
+ 'blue': zip(_vs,v[2],v[2]) }
add_cmap(k, cdict)
def _extract_lookup_table(cmap_name):
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