fix: fill out code for final two examples

Author: henryiii

1-PyHEP-topical.ipynb

@@ -21,6 +21,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
     "import hist\n",
     "from hist import Hist"
    ]
@@ -36,13 +38,13 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ce94c89a-d0cd-4f45-9b8b-b2ef3b23962a",
-   "metadata": {},
-   "outputs": [],
+   "cell_type": "markdown",
+   "id": "00bdb721-5f66-4128-a070-f92850572e88",
+   "metadata": {
+    "tags": []
+   },
    "source": [
-    "import numpy as np"
+    "## Introduction"
    ]
   },
   {
@@ -413,8 +415,7 @@
     "import PIL.Image\n",
     "import PIL.ImageDraw\n",
     "import PIL.ImageFilter\n",
-    "import PIL.ImageFont\n",
-    "import matplotlib.pyplot as plt"
+    "import PIL.ImageFont"
    ]
   },
   {
@@ -429,7 +430,10 @@
     "draw = PIL.ImageDraw.Draw(image)\n",
     "\n",
     "# use a truetype font\n",
-    "font = PIL.ImageFont.truetype(\"DejaVuSans-Bold.ttf\", 90)\n",
+    "try:\n",
+    "    font = PIL.ImageFont.truetype(\"DejaVuSans-Bold.ttf\", 90)\n",
+    "except OSError:\n",
+    "    font = PIL.ImageFont.truetype(\"Arial Bold.ttf\", 90)\n",
     "\n",
     "draw.text((30, 0), \"PyHEP\", font=font)"
    ]
@@ -515,30 +519,47 @@
    "source": [
     "`hist` supports Stacked Histograms! A histogram stack holds multiple 1-D histograms into a stack, whose axes are required to match.\n",
     "\n",
-    "Manipulation and mutliple math operations can also be performed on stacks. You can find more about them in the [Hist - Stack documentation](https://hist.readthedocs.io/en/latest/user-guide/notebooks/Stack.html)."
+    "Manipulation and multiple math operations can also be performed on stacks. You can find more about them in the [Hist - Stack documentation](https://hist.readthedocs.io/en/latest/user-guide/notebooks/Stack.html)."
    ]
   },
   {
-   "cell_type": "markdown",
-   "id": "d52dcb66-060f-4529-976e-c6d5be99cff8",
-   "metadata": {
-    "jp-MarkdownHeadingCollapsed": true,
-    "tags": []
-   },
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d990e620-6955-4328-8459-01f4efe6984f",
+   "metadata": {},
+   "outputs": [],
    "source": [
-    "<div>\n",
-    "<img src=\"https://hist.readthedocs.io/en/latest/_images/user-guide_notebooks_Stack_4_0.png\" width=\"360\"/>\n",
-    "</div>"
+    "ax = hist.axis.Regular(25, -5, 5, flow=False, name=\"x\")\n",
+    "cax = hist.axis.StrCategory([\"signal\", \"upper\", \"lower\"], name=\"c\")\n",
+    "full_hist = Hist(ax, cax)\n",
+    "\n",
+    "full_hist.fill(x=rng.standard_normal(size=600), c=\"signal\")\n",
+    "full_hist.fill(x=2 * rng.standard_normal(size=500) + 2, c=\"upper\")\n",
+    "full_hist.fill(x=2 * rng.standard_normal(size=500) - 2, c=\"lower\")\n",
+    "\n",
+    "s = full_hist.stack(\"c\")"
    ]
   },
   {
-   "cell_type": "markdown",
-   "id": "239c82ac-6e24-49dd-be26-6c999f0af83e",
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "b1848cee-352a-4d12-a12e-913499bbe54a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "s.plot()\n",
+    "plt.legend();"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d6e8eb97-dc31-4336-bc96-a2779c069661",
    "metadata": {},
+   "outputs": [],
    "source": [
-    "<div>\n",
-    "<img src=\"https://hist.readthedocs.io/en/latest/_images/user-guide_notebooks_Stack_6_0.png\" width=\"360\"/>\n",
-    "</div>"
+    "s[::-1].plot(stack=True, histtype=\"fill\")\n",
+    "plt.legend();"
    ]
   },
   {
@@ -558,13 +579,52 @@
    ]
   },
   {
-   "cell_type": "markdown",
-   "id": "a4a89cdf-2b41-484d-9527-9543f926009c",
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "f480f23f-65ab-47da-93cd-2c26ee02a537",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from scipy import interpolate"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0e13d997-871e-495a-8a09-d386f4365a32",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# We obtain evenly spaced numbers over the specified interval.\n",
+    "x = np.linspace(-27, 27, num=250, endpoint=True)\n",
+    "\n",
+    "# Define a Hist object and fill it.\n",
+    "h = Hist.new.Reg(10, -30, 30).Double()\n",
+    "centers = h.axes[0].centers\n",
+    "weights = np.cos(-(centers**2) / 9.0) ** 2\n",
+    "h.fill(centers, weight=weights)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c88ad823-b3c4-4a66-b8e2-ce9bf8c81e7a",
    "metadata": {},
+   "outputs": [],
+   "source": [
+    "linear_interp = interpolate.interp1d(h.axes[0].centers, h.values(), kind=\"linear\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "20fe51c2-edbe-449e-a20a-d0f65bcafb72",
+   "metadata": {},
+   "outputs": [],
    "source": [
-    "<div>\n",
-    "<img src=\"https://hist.readthedocs.io/en/latest/_images/user-guide_notebooks_Interpolation_10_0.png\" width=\"360\"/>\n",
-    "</div>"
+    "h.plot()  # Plot the histogram\n",
+    "plt.plot(h.axes[0].centers, h.values(), \"o\")\n",
+    "plt.plot(x, linear_interp(x), \"-.\");"
    ]
   }
  ],

files/SimpleExample.ipynb

@@ -6,10 +6,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import micropip\n",
-    "\n",
-    "await micropip.install(\"hist\")\n",
-    "await micropip.install(\"mplhep<0.3.0\")"
+    "%matplotlib inline"
    ]
   },
   {
@@ -18,7 +15,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import hist"
+    "import micropip\n",
+    "\n",
+    "await micropip.install(\"hist\")\n",
+    "await micropip.install(\"mplhep<0.3.0\")"
    ]
   },
   {
@@ -27,7 +27,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "h = hist.Hist.new.Reg(10, 0, 1).Double()"
+    "import hist\n",
+    "import numpy as np"
    ]
   },
   {
@@ -36,7 +37,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import numpy as np"
+    "rng = np.random.default_rng()"
    ]
   },
   {
@@ -45,7 +46,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "h.fill(np.random.normal(0.5, 0.3, size=1_000_000))"
+    "h = hist.Hist.new.Reg(10, 0, 1).Double()"
    ]
   },
   {
@@ -54,7 +55,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%matplotlib inline"
+    "h.fill(rng.normal(0.5, 0.3, size=1_000_000))"
    ]
   },
   {
@@ -65,13 +66,6 @@
    "source": [
     "h.plot()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {