Merge pull request #412 from diana-hep/develop

Tutorial fixes
madminer-tool · Feb 28, 2020 · b49f82d · b49f82d
2 parents fb6c92d + a2d36fc
commit b49f82d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 107 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -20,11 +20,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'MadMiner'
-copyright = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer 2018'
+copyright = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer 2018-2020'
 author = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer'
 
 # The short X.Y version
-version = '0.6.3'
+version = '0.6.4'
 # The full version, including alpha/beta/rc tags
 release = version
 

diff --git a/examples/morphing_basis/animate.ipynb b/examples/morphing_basis/animate.ipynb
diff --git a/examples/morphing_basis/interactive_basis_chooser.ipynb b/examples/morphing_basis/interactive_basis_chooser.ipynb
@@ -18,7 +18,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -33,10 +33,10 @@
     "import sys\n",
     "\n",
     "try:\n",
-    "    from madminer.morphing import Morpher\n",
+    "    from madminer.utils.morphing import PhysicsMorpher as Morpher\n",
     "except ImportError:\n",
     "    sys.path.append('../..')\n",
-    "    from madminer.morphing import Morpher\n",
+    "    from madminer.utils.morphing import PhysicsMorpher as Morpher\n",
     "    "
    ]
   },
@@ -49,7 +49,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -66,7 +66,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -77,7 +77,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -101,7 +101,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -132,7 +132,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -148,7 +148,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -175,13 +175,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "57775ec5c94a40dd914046b614250b40",
+       "model_id": "023eb3403e754aec98b2dcb1d4026d74",
        "version_major": 2,
        "version_minor": 0
       },

diff --git a/madminer/__version__.py b/madminer/__version__.py
@@ -1 +1 @@
-__version__ = "0.6.3"
+__version__ = "0.6.4"
diff --git a/madminer/utils/interfaces/mg_cards.py b/madminer/utils/interfaces/mg_cards.py
@@ -23,7 +23,7 @@ def export_param_card(benchmark, parameters, param_card_template_file, mg_proces
         if parameter_transform is not None:
             variables = {"theta": parameter_value}
             parameter_value = eval(parameter_transform, variables)
-        parameter_value=float(parameter_value)
+        parameter_value = float(parameter_value)
 
         # Find entry
         current_block = None

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 EMAIL = '[email protected]'
 AUTHOR = 'Johann Brehmer, Felix Kling, Irina Espejo, Kyle Cranmer'
 REQUIRES_PYTHON = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'
-VERSION = '0.6.3'
+VERSION = '0.6.4'
 
 # What packages are required for this module to be executed?
 REQUIRED = [