diff --git a/docs/conf.py b/docs/conf.py index 9416e2059..c86bb2a7d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,9 +24,9 @@ author = 'Johann Brehmer, Felix Kling, and Kyle Cranmer' # The short X.Y version -version = '0.2.0' +version = '0.2.1' # The full version, including alpha/beta/rc tags -release = '0.2.0' +release = '0.2.1' # -- General configuration --------------------------------------------------- diff --git a/examples/tutorial_parton_level/1_from_cards_to_likelihood_ratio.ipynb b/examples/tutorial_parton_level/1_from_cards_to_likelihood_ratio.ipynb index 1b73a5f44..b1b143bd9 100755 --- a/examples/tutorial_parton_level/1_from_cards_to_likelihood_ratio.ipynb +++ b/examples/tutorial_parton_level/1_from_cards_to_likelihood_ratio.ipynb @@ -593,7 +593,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "metadata": { "scrolled": true }, @@ -619,7 +619,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 10, "metadata": {}, "outputs": [], "source": [ @@ -642,9 +642,35 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 11, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "17:21 madminer.sampling INFO Loading data from data/madminer_example_with_data.h5\n", + "17:21 madminer.sampling INFO Found 2 parameters\n", + "17:21 madminer.sampling INFO Did not find nuisance parameters\n", + "17:21 madminer.sampling INFO Found 6 benchmarks, of which 6 physical\n", + "17:21 madminer.sampling INFO Found 2 observables\n", + "17:21 madminer.sampling INFO Found 100000 events\n", + "17:21 madminer.sampling INFO Found morphing setup with 6 components\n" + ] + }, + { + "data": { + "image/png": "iVBORw0KGgoAAAANSUhEUgAAAjgAAAEYCAYAAABRMYxdAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAADl0RVh0U29mdHdhcmUAbWF0cGxvdGxpYiB2ZXJzaW9uIDIuMi4zLCBodHRwOi8vbWF0cGxvdGxpYi5vcmcvIxREBQAAIABJREFUeJzt3Xu8VVW9///XRxQIxBuggoCgoaXiQd1gqXm/QB0vCQlejqYerJNknfKkfPvm4VietJvWT78qmmZeAm8pmkapiKWGoJKIhiJq7MQERBRREPz8/hhjwWKzLnPtveaea639fj4e8zHnmmvMMT77NvZYY445hrk7IiIiIo1ks6wDEBEREak2NXBERESk4aiBIyIiIg1HDRwRERFpOGrgiIiISMNRA0dEREQajho4IiIi0nDUwBEREZGGowaOiIiINJzNsw6gnvTq1csHDhyYdRgiDenpp59e6u69s46jGlRXiKQnaV2hBk4FBg4cyOzZs7MOQ6QhmdnrWcdQLaorRNKTtK7QLSoRERFpOGrgiIiISMNRA0dEREQajsbgiNSQjz76iObmZj788MOsQ0lN165d6devH1tssUXWoYjULdUV5amBI1JDmpub6dGjBwMHDsTMsg6n6tydZcuW0dzczKBBg7IOR6Ruqa4oT7eoRGrIhx9+SM+ePRuywgIwM3r27NnQnzpF2oPqivLUwBGpMY1aYeU0+tcn0l4a/W+prV+fGjgi0qGZ2Qgzm29mC8zswgLvX25mc+L2kpm9k0WcIlIZjcGpwMIl7zPm2icTpT1+6E6csv+AlCMSSccll1zCbbfdRqdOndhss8249tprueCCC1i4cCGvv/76+k9WJ5xwAg899BArV67MOOLWMbNOwFXAUUAzMMvMprr7C7k07v6feem/DuzT7oFWavaNMPdOOPN34fXjv4CXpm2cZouucNpd7R+bNJRarivUwEnBC4vfBVADR+rSk08+yf33388zzzxDly5dWLp0KWvWrAFgm2224fHHH+eggw7inXfeYfHixRlH22bDgQXuvhDAzCYDxwMvFEl/MvDf7RRb6829E17/c9ZRSIOr9bpCDZwK7NK7O1O+8tmy6ZL28oiU8j/3zeOFN96tap579N2K/z52z5JpFi9eTK9evejSpQsAvXr1Wv/e2LFjmTx5MgcddBB3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\n", + "text/plain": [ + "
" + ] + }, + "metadata": { + "needs_background": "light" + }, + "output_type": "display_data" + } + ], "source": [ "_ = plot_distributions(\n", " filename='data/madminer_example_with_data.h5',\n", @@ -675,9 +701,18 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 12, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "17:21 madminer.sampling INFO Copying setup from data/madminer_example_with_data.h5 to data/madminer_example_shuffled.h5\n", + "17:21 madminer.sampling INFO Loading samples from file 1 / 1 at data/madminer_example_with_data.h5, multiplying weights with k factor 1.0\n" + ] + } + ], "source": [ "combine_and_shuffle(\n", " ['data/madminer_example_with_data.h5'],\n", diff --git a/madminer/__version__.py b/madminer/__version__.py index d3ec452c3..3ced3581b 100644 --- a/madminer/__version__.py +++ b/madminer/__version__.py @@ -1 +1 @@ -__version__ = "0.2.0" +__version__ = "0.2.1" diff --git a/madminer/utils/interfaces/lhe.py b/madminer/utils/interfaces/lhe.py index 35a7dd037..f31cbd49e 100644 --- a/madminer/utils/interfaces/lhe.py +++ b/madminer/utils/interfaces/lhe.py @@ -571,7 +571,7 @@ def _smear_variable(true_value, resolutions, id): return true_value + np.random.normal(0.0, res, 1) - except TypeError, KeyError: + except (TypeError, KeyError): return true_value diff --git a/setup.py b/setup.py index c71899d7b..a23d9df0d 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ EMAIL = 'johann.brehmer@nyu.edu' AUTHOR = 'Johann Brehmer, Felix Kling, Kyle Cranmer' REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4' -VERSION = '0.2.0' +VERSION = '0.2.1' # What packages are required for this module to be executed? REQUIRED = [