DEP Fix MPL colorbar norm deprecation (#430)

Closes #414 by adding a mesh detector plot
CORE-GATECH-GROUP · Dec 22, 2020 · 8bb05e7 · 8bb05e7
1 parent 628f81e
commit 8bb05e7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/serpentTools/plot.py b/serpentTools/plot.py
@@ -139,7 +139,7 @@ def cartMeshPlot(data, xticks=None, yticks=None, ax=None, cmap=None,
     else:
         X, Y = meshgrid(xticks, yticks)
         mappable = ax.pcolormesh(X, Y, data, cmap=cmap, norm=norm, **kwargs)
-    addColorbar(ax, mappable, norm, cbarLabel)
+    addColorbar(ax, mappable, cbarLabel)
 
     return ax
 

diff --git a/serpentTools/utils/plot.py b/serpentTools/utils/plot.py
@@ -337,7 +337,7 @@ def addColorbar(ax, mappable, norm=None, cbarLabel=None):
         The colorbar that was added
 
     """
-    cbar = pyplot.colorbar(mappable, ax=ax, norm=norm)
+    cbar = pyplot.colorbar(mappable, ax=ax)
     if cbarLabel:
         cbar.ax.set_ylabel(cbarLabel)
     return cbar
diff --git a/tests/plots/result_images/testBwrMeshPlot.png b/tests/plots/result_images/testBwrMeshPlot.png
diff --git a/tests/plots/test_detectors.py b/tests/plots/test_detectors.py
@@ -1,8 +1,19 @@
-from . import compare_or_update_plot
+import pytest
 from serpentTools.data import readDataFile
 
+from . import compare_or_update_plot
+
 
 @compare_or_update_plot
 def testSpectrumPlot():
     reader = readDataFile("bwr_det0.m")
     reader["spectrum"].spectrumPlot()
+
+
+@compare_or_update_plot
+def testBwrMeshPlot():
+    reader = readDataFile("bwr_det0.m")
+    # Ensure that fix for #414 in in: matplotlib colorbar norm
+    with pytest.warns(None) as record:
+        reader["xymesh"].meshPlot(fixed={"energy": 0})
+    assert len(record) == 0