-Fix unit tests

terrapower · May 8, 2020 · 51b3537 · 51b3537
1 parent f69f2f4
commit 51b3537
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/armi/tests/tutorials/data_model.ipynb b/armi/tests/tutorials/data_model.ipynb
@@ -339,7 +339,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "core.plotFaceMap(\"power\")"
+    "from armi.utils import plotting\n",
+    "plotting.plotFaceMap(core, \"power\")"
    ]
   },
   {
@@ -424,7 +425,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "core.plotFaceMap(\"power\")"
+    "plotting.plotFaceMap(core, \"power\")"
    ]
   },
   {

diff --git a/armi/utils/plotting.py b/armi/utils/plotting.py
@@ -329,7 +329,9 @@ def plotFaceMap(
         colbar.ax.tick_params(labelsize=16)
 
     if legendMap is not None:
-        legend = _createFaceMapLegend(legendMap, cmapName, collection.norm)
+        legend = _createFaceMapLegend(
+            legendMap, matplotlib.cm.get_cmap(cmapName), collection.norm
+        )
     else:
         legend = None
 
@@ -430,6 +432,9 @@ def _setPlotValText(ax, texts, core, data, labels, labelFmt, fontSize):
             text = ax.text(
                 x, y, label, zorder=1, ha="center", va="center", fontsize=fontSize
             )
+        else:
+            # labelFmt was none, so they don't want any text plotted
+            continue
         texts.append(text)