jenshnielsen · Oct 21, 2015 · Aug 19, 2015 · Aug 19, 2015 · Aug 19, 2015 · Aug 19, 2015
diff --git a/doc/users/colormaps.rst b/doc/users/colormaps.rst
@@ -8,24 +8,37 @@ Choosing Colormaps
 Overview
 ========
 
-The idea behind choosing a good colormap is to find a good representation in 3D colorspace for your data set. The best colormap for any given data set depends on many things including:
+The idea behind choosing a good colormap is to find a good representation in 3D
+colorspace for your data set. The best colormap for any given data set depends
+on many things including:
 
 - Whether representing form or metric data ([Ware]_)
 - Your knowledge of the data set (*e.g.*, is there a critical value from which the other values deviate?)
 - If there is an intuitive color scheme for the parameter you are plotting
 - If there is a standard in the field the audience may be expecting
 
-For many applications, a perceptual colormap is the best choice --- one in which equal steps in data are perceived as equal steps in the color space. Researchers have found that the human brain perceives changes in the lightness parameter as changes in the data much better than, for example, changes in hue. Therefore, colormaps which have monotonically increasing lightness through the colormap will be better interpreted by the viewer.
+For many applications, a perceptual colormap is the best choice --- one in which
+equal steps in data are perceived as equal steps in the color space. Researchers
+have found that the human brain perceives changes in the lightness parameter as
+changes in the data much better than, for example, changes in hue. Therefore,
+colormaps which have monotonically increasing lightness through the colormap
+will be better interpreted by the viewer.
 
-Color can be represented in 3D space in various ways. One way to represent color is using CIELAB. In CIELAB, color space is represented by lightness, :math:`L^*`; red-green, :math:`a^*`; and yellow-blue, :math:`b^*`. The lightness parameter :math:`L^*` can then be used to learn more about how the matplotlib colormaps will be perceived by viewers.
+Color can be represented in 3D space in various ways. One way to represent color
+is using CIELAB. In CIELAB, color space is represented by lightness,
+:math:`L^*`; red-green, :math:`a^*`; and yellow-blue, :math:`b^*`. The lightness
+parameter :math:`L^*` can then be used to learn more about how the matplotlib
+colormaps will be perceived by viewers.
 
-An excellent starting resource for learning about human perception of colormaps is from [IBM]_.
+An excellent starting resource for learning about human perception of colormaps
+is from [IBM]_.
 
 
 Classes of colormaps
 ====================
 
-Colormaps are often split into several categories based on their function (see, *e.g.*, [Moreland]_):
+Colormaps are often split into several categories based on their function (see,
+*e.g.*, [Moreland]_):
 
 1. Sequential: change in lightness and often saturation of color incrementally, often using a single hue; should be used for representing information that has ordering.
 2. Diverging: change in lightness and possibly saturation of two different colors that meet in the middle at an unsaturated color; should be used when the information being plotted has a critical middle value, such as topography or when the data deviates around zero.
@@ -35,64 +48,127 @@ Colormaps are often split into several categories based on their function (see,
 Lightness of matplotlib colormaps
 =================================
 
-Here we examine the lightness values of the matplotlib colormaps. Note that some documentation on the colormaps is available ([list-colormaps]_).
+Here we examine the lightness values of the matplotlib colormaps. Note that some
+documentation on the colormaps is available ([list-colormaps]_).
 
 Sequential
 ----------
 
-For the Sequential plots, the lightness value increases monotonically through the colormaps. This is good. Some of the :math:`L^*` values in the colormaps span from 0 to 100 (binary and the other grayscale), and others start around :math:`L^*=20`. Those that have a smaller range of :math:`L^*` will accordingly have a smaller perceptual range. Note also that the :math:`L^*` function varies amongst the colormaps: some are approximately linear in :math:`L^*` and others are more curved.
+For the Sequential plots, the lightness value increases monotonically through
+the colormaps. This is good. Some of the :math:`L^*` values in the colormaps
+span from 0 to 100 (binary and the other grayscale), and others start around
+:math:`L^*=20`. Those that have a smaller range of :math:`L^*` will accordingly
+have a smaller perceptual range. Note also that the :math:`L^*` function varies
+amongst the colormaps: some are approximately linear in :math:`L^*` and others
+are more curved.
 
 Sequential2
 -----------
 
-Many of the :math:`L^*` values from the Sequential2 plots are monotonically increasing, but some (autumn, cool, spring, and winter) plateau or even go both up and down in :math:`L^*` space. Others (afmhot, copper, gist_heat, and hot) have kinks in the :math:`L^*` functions. Data that is being represented in a region of the colormap that is at a plateau or kink will lead to a perception of banding of the data in those values in the colormap (see [mycarta-banding]_ for an excellent example of this). 
+Many of the :math:`L^*` values from the Sequential2 plots are monotonically
+increasing, but some (autumn, cool, spring, and winter) plateau or even go both
+up and down in :math:`L^*` space. Others (afmhot, copper, gist_heat, and hot)
+have kinks in the :math:`L^*` functions. Data that is being represented in a
+region of the colormap that is at a plateau or kink will lead to a perception of
+banding of the data in those values in the colormap (see [mycarta-banding]_ for
+an excellent example of this).
 
 Diverging
 ---------
 
-For the Diverging maps, we want to have monotonically increasing :math:`L^*` values up to a maximum, which should be close to :math:`L^*=100`, followed by monotonically decreasing :math:`L^*` values. We are looking for approximately equal minimum :math:`L^*` values at opposite ends of the colormap. By these measures, BrBG and RdBu are good options. coolwarm is a good option, but it doesn't span a wide range of :math:`L^*` values (see grayscale section below). 
+For the Diverging maps, we want to have monotonically increasing :math:`L^*`
+values up to a maximum, which should be close to :math:`L^*=100`, followed by
+monotonically decreasing :math:`L^*` values. We are looking for approximately
+equal minimum :math:`L^*` values at opposite ends of the colormap. By these
+measures, BrBG and RdBu are good options. coolwarm is a good option, but it
+doesn't span a wide range of :math:`L^*` values (see grayscale section below).
 
 Qualitative
 -----------
 
-Qualitative colormaps are not aimed at being perceptual maps, but looking at the lightness parameter can verify that for us. The :math:`L^*` values move all over the place throughout the colormap, and are clearly not monotonically increasing. These would not be good options for use as perceptual colormaps.
+Qualitative colormaps are not aimed at being perceptual maps, but looking at the
+lightness parameter can verify that for us. The :math:`L^*` values move all over
+the place throughout the colormap, and are clearly not monotonically increasing.
+These would not be good options for use as perceptual colormaps.
 
 Miscellaneous
 -------------
 
-Some of the miscellaneous colormaps have particular uses they have been created for. For example, gist_earth, ocean, and terrain all seem to be created for plotting topography (green/brown) and water depths (blue) together. We would expect to see a divergence in these colormaps, then, but multiple kinks may not be ideal, such as in gist_earth and terrain. CMRmap was created to convert well to grayscale, though it does appear to have some small kinks in :math:`L^*`. cubehelix was created to vary smoothly in both lightness and hue, but appears to have a small hump in the green hue area. 
+Some of the miscellaneous colormaps have particular uses they have been created
+for. For example, gist_earth, ocean, and terrain all seem to be created for
+plotting topography (green/brown) and water depths (blue) together. We would
+expect to see a divergence in these colormaps, then, but multiple kinks may not
+be ideal, such as in gist_earth and terrain. CMRmap was created to convert well
+to grayscale, though it does appear to have some small kinks in :math:`L^*`.
+cubehelix was created to vary smoothly in both lightness and hue, but appears to
+have a small hump in the green hue area.
 
-The often-used jet colormap is included in this set of colormaps. We can see that the :math:`L^*` values vary widely throughout the colormap, making it a poor choice for representing data for viewers to see perceptually. See an extension on this idea at [mycarta-jet]_.
+The often-used jet colormap is included in this set of colormaps. We can see
+that the :math:`L^*` values vary widely throughout the colormap, making it a
+poor choice for representing data for viewers to see perceptually. See an
+extension on this idea at [mycarta-jet]_.
 
 .. plot:: users/plotting/colormaps/lightness.py
 
 
 :math:`L^*` function
 ====================
 
-There are multiple approaches to finding the best function for :math:`L^*` across a colormap. Linear gives reasonable results (*e.g.*, [mycarta-banding]_, [mycarta-lablinear]_). However, the Weber-Fechner law, and more generally and recently, Stevens' Law, indicates that a logarithmic or geometric relationship might be better (see effort on this front at [mycarta-cubelaw]_).
+There are multiple approaches to finding the best function for :math:`L^*`
+across a colormap. Linear gives reasonable results (*e.g.*, [mycarta-banding]_,
+[mycarta-lablinear]_). However, the Weber-Fechner law, and more generally and
+recently, Stevens' Law, indicates that a logarithmic or geometric relationship
+might be better (see effort on this front at [mycarta-cubelaw]_).
 
 .. plot:: users/plotting/colormaps/Lfunction.py
 
 
 Grayscale conversion
 ====================
 
-Conversion to grayscale is important to pay attention to for printing publications that have color plots. If this is not paid attention to ahead of time, your readers may end up with indecipherable plots because the grayscale changes unpredictably through the colormap. 
-
-Conversion to grayscale is done in many different ways [bw]_. Some of the better ones use a linear combination of the rgb values of a pixel, but weighted according to how we perceive color intensity. A nonlinear method of conversion to grayscale is to use the :math:`L^*` values of the pixels. In general, similar principles apply for this question as they do for presenting one's information perceptually; that is, if a colormap is chosen that has monotonically increasing in :math:`L^*` values, it will print in a reasonable manner to grayscale. 
-
-With this in mind, we see that the Sequential colormaps have reasonable representations in grayscale. Some of the Sequential2 colormaps have decent enough grayscale representations, though some (autumn, spring, summer, winter) have very little grayscale change. If a colormap like this was used in a plot and then the plot was printed to grayscale, a lot of the information may map to the same gray values. The Diverging colormaps mostly vary from darker gray on the outer edges to white in the middle. Some (PuOr and seismic) have noticably darker gray on one side than the other and therefore are not very symmetric. coolwarm has little range of gray scale and would print to a more uniform plot, losing a lot of detail. Note that overlaid, labeled contours could help differentiate between one side of the colormap vs. the other since color cannot be used once a plot is printed to grayscale. Many of the Qualitative and Miscellaneous colormaps, such as Accent, hsv, and jet, change from darker to lighter and back to darker gray throughout the colormap. This would make it impossible for a viewer to interpret the information in a plot once it is printed in grayscale.
+Conversion to grayscale is important to pay attention to for printing
+publications that have color plots. If this is not paid attention to ahead of
+time, your readers may end up with indecipherable plots because the grayscale
+changes unpredictably through the colormap.
+
+Conversion to grayscale is done in many different ways [bw]_. Some of the better
+ones use a linear combination of the rgb values of a pixel, but weighted
+according to how we perceive color intensity. A nonlinear method of conversion
+to grayscale is to use the :math:`L^*` values of the pixels. In general, similar
+principles apply for this question as they do for presenting one's information
+perceptually; that is, if a colormap is chosen that has monotonically increasing
+in :math:`L^*` values, it will print in a reasonable manner to grayscale.
+
+With this in mind, we see that the Sequential colormaps have reasonable
+representations in grayscale. Some of the Sequential2 colormaps have decent
+enough grayscale representations, though some (autumn, spring, summer, winter)
+have very little grayscale change. If a colormap like this was used in a plot
+and then the plot was printed to grayscale, a lot of the information may map to
+the same gray values. The Diverging colormaps mostly vary from darker gray on
+the outer edges to white in the middle. Some (PuOr and seismic) have noticably
+darker gray on one side than the other and therefore are not very symmetric.
+coolwarm has little range of gray scale and would print to a more uniform plot,
+losing a lot of detail. Note that overlaid, labeled contours could help
+differentiate between one side of the colormap vs. the other since color cannot
+be used once a plot is printed to grayscale. Many of the Qualitative and
+Miscellaneous colormaps, such as Accent, hsv, and jet, change from darker to
+lighter and back to darker gray throughout the colormap. This would make it
+impossible for a viewer to interpret the information in a plot once it is
+printed in grayscale.
 
 .. plot:: users/plotting/colormaps/grayscale.py
 
 
 Color vision deficiencies
 =========================
 
-There is a lot of information available about color blindness available (*e.g.*, [colorblindness]_). Additionally, there are tools available to convert images to how they look for different types of color vision deficiencies (*e.g.*, [asp]_).
+There is a lot of information available about color blindness available (*e.g.*,
+[colorblindness]_). Additionally, there are tools available to convert images to
+how they look for different types of color vision deficiencies (*e.g.*, [asp]_).
 
-The most common form of color vision deficiency involves differentiating between red and green. Thus, avoiding colormaps with both red and green will avoid many problems in general.
+The most common form of color vision deficiency involves differentiating between
+red and green. Thus, avoiding colormaps with both red and green will avoid many
+problems in general.
 
 
 References
@@ -109,4 +185,3 @@ References
 .. [colorblindness] http://aspnetresources.com/tools/colorBlindness
 .. [asp] http://aspnetresources.com/tools/colorBlindness
 .. [IBM] http://www.research.ibm.com/people/l/lloydt/color/color.HTM
-
diff --git a/doc/users/plotting/colormaps/Lfunction.py b/doc/users/plotting/colormaps/Lfunction.py
@@ -3,7 +3,6 @@
 with the binary matplotlib colormap, too. Trying to show the difference between
 adding blackness to a color at different rates.
 '''
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 import colorconv as color
@@ -14,8 +13,9 @@
 from matplotlib import cm
 
 
-mpl.rcParams.update({'font.size': 20})
-mpl.rcParams['font.sans-serif'] = 'Arev Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif'
+mpl.rcParams.update({'font.size': 12})
+mpl.rcParams['font.sans-serif'] = ('Arev Sans, Bitstream Vera Sans,'
+'Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif')
 mpl.rcParams['mathtext.fontset'] = 'custom'
 mpl.rcParams['mathtext.cal'] = 'cursive'
 mpl.rcParams['mathtext.rm'] = 'sans'
@@ -42,7 +42,6 @@
 for i in range(red.shape[1]):
     # more blackness is closer to 0 than one, and in first column of LAB
     lab_add[0,i,0] = lab_add[0,i,0] - 10*i
-    print(i,k)
     if i != 0:
         lab_geometric[0,i,0] = lab_geometric[0,i,0] - 10*k
         k *= 2
@@ -55,17 +54,15 @@
 temp = color.lab2rgb(lab_geometric)
 rgb_geometric[0,:,0] = temp[0,:,0]
 
-fig = plt.figure()
+fig = plt.figure(figsize=(5,3))
 k = 1
 for i in range(red.shape[1]):
 
     # LHS: additive
     ax1 = fig.add_subplot(nrows,2,i*2+1, axisbg=tuple(rgb_add[0,i,:]))
-    print(tuple(lab_add[0,i,:]))#, tuple(rgb_add[0,i,:])
 
     # RHS: multiplicative
     ax2 = fig.add_subplot(nrows,2,i*2+2, axisbg=tuple(rgb_geometric[0,i,:]))
-    print(tuple(lab_geometric[0,i,:]))#, tuple(rgb_geometric[0,i,:])
 
     # ylabels
     if i!=0:
@@ -122,17 +119,15 @@
     rgb_add[:,i,:] = rgb[:,i*di+I0,:]
 
     if i != 0:
-        print(i*di+I0, di*k+I0, (I0**(1./3)+i*di**(1./3))**3)
         rgb_geometric[:,i,:] = rgb[:,I0+di*k,:]
         k *= 2
     elif i==0:
-        print(i*di+I0, I0, (I0**(1./3)+i*di**(1./3))**3)
         rgb_geometric[:,i,:] = rgb[:,I0,:]
 
 lab_add = color.rgb2lab(rgb_add)
 lab_geometric = color.rgb2lab(rgb_geometric)
 
-fig = plt.figure()
+fig = plt.figure(figsize=(5,3))
 k = 1
 for i in range(nrows):
 
@@ -165,7 +160,7 @@
     ax2.spines['left'].set_visible(False)
 
 # common ylabel
-ax1.text(-0.3, 4.0, 'Steps through map indices',
+ax1.text(-0.3, 4.5, 'Steps through map indices',
             rotation=90, transform=ax1.transAxes)
 
 fig.subplots_adjust(hspace=0.0)

diff --git a/doc/users/plotting/colormaps/grayscale.py b/doc/users/plotting/colormaps/grayscale.py
@@ -13,7 +13,8 @@
 import matplotlib as mpl
 
 mpl.rcParams.update({'font.size': 14})
-mpl.rcParams['font.sans-serif'] = 'Arev Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif'
+mpl.rcParams['font.sans-serif'] = ('Arev Sans, Bitstream Vera Sans,'
+'Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif')
 mpl.rcParams['mathtext.fontset'] = 'custom'
 mpl.rcParams['mathtext.cal'] = 'cursive'
 mpl.rcParams['mathtext.rm'] = 'sans'
@@ -23,15 +24,17 @@
 mpl.rcParams['mathtext.sf'] = 'sans'
 mpl.rcParams['mathtext.fallback_to_cm'] = 'True'
 
-# Have colormaps separated into categories: http://matplotlib.org/examples/color/colormaps_reference.html
+# Have colormaps separated into categories:
+# http://matplotlib.org/examples/color/colormaps_reference.html
 
 cmaps = [('Sequential',     ['Blues', 'BuGn', 'BuPu',
                              'GnBu', 'Greens', 'Greys', 'Oranges', 'OrRd',
                              'PuBu', 'PuBuGn', 'PuRd', 'Purples', 'RdPu',
                              'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd']),
          ('Sequential (2)', ['afmhot', 'autumn', 'bone', 'cool', 'copper',
-                             'gist_heat', 'gray', 'hot', 'pink',
-                             'spring', 'summer', 'winter']),
+                             'gist_heat', 'gray', 'hot', 'inferno', 'magma',
+                             'pink', 'plasma', 'spring', 'summer', 'viridis',
+                             'winter']),
          ('Diverging',      ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr',
                              'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'Spectral',
                              'seismic']),
@@ -46,13 +49,15 @@
 # indices to step through colormap
 x = np.linspace(0.0, 1.0, 100)
 
-nrows = max(len(cmap_list) for cmap_category, cmap_list in cmaps)
+# nrows = max(len(cmap_list) for cmap_category, cmap_list in cmaps)
 gradient = np.linspace(0, 1, 256)
 gradient = np.vstack((gradient, gradient))
 
 def plot_color_gradients(cmap_category, cmap_list):
+    nrows = len(cmap_list)
     fig, axes = plt.subplots(nrows=nrows, ncols=2)
-    fig.subplots_adjust(top=0.95, bottom=0.01, left=0.2, right=0.99, wspace=0.05)
+    fig.subplots_adjust(top=0.95, bottom=0.01, left=0.2, right=0.99,
+                        wspace=0.05)
     fig.suptitle(cmap_category + ' colormaps', fontsize=14, y=1.0, x=0.6)
 
     for ax, name in zip(axes, cmap_list):