Merge pull request #260 from johannbrehmer/develop

Last changes for v0.2.6
madminer-tool · Feb 5, 2019 · 9fed29c · 9fed29c
2 parents e2ce179 + 1ecd4b5
commit 9fed29c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -24,9 +24,9 @@
 author = 'Johann Brehmer, Felix Kling, Irina Espejo, and Kyle Cranmer'
 
 # The short X.Y version
-version = '0.2.5'
+version = '0.2.6'
 # The full version, including alpha/beta/rc tags
-release = '0.2.5'
+release = '0.2.6'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/madminer/__version__.py b/madminer/__version__.py
@@ -1 +1 @@
-__version__ = "0.2.5"
+__version__ = "0.2.6"
diff --git a/madminer/core.py b/madminer/core.py
@@ -688,7 +688,8 @@ def run(
 
         python2_override : bool, optional
             If True, MadMiner explicitly calls "python2" instead of relying on the system Python version to be
-            Python 2.6 or Python 2.7. Default: False.
+            Python 2.6 or Python 2.7. If you use systematics, make sure that the python interface of LHAPDF was compiled
+            with the Python version you are using. Default: False.
 
         Returns
         -------
@@ -799,7 +800,8 @@ def run_multiple(
 
         python2_override : bool, optional
             If True, MadMiner explicitly calls "python2" instead of relying on the system Python version to be
-            Python 2.6 or Python 2.7. Default: False.
+            Python 2.6 or Python 2.7. If you use systematics, make sure that the python interface of LHAPDF was compiled
+            with the Python version you are using. Default: False.
 
         Returns
         -------

diff --git a/madminer/utils/interfaces/mg.py b/madminer/utils/interfaces/mg.py
@@ -78,7 +78,9 @@ def generate_mg_process(
     # Explicitly call Python 2 if necessary
     python_call = "python2 " if explicit_python_call else ""
 
-    _ = call_command(initial_command + python_call + mg_directory + "/bin/mg5_aMC " + temp_proc_card_file, log_file=log_file)
+    _ = call_command(
+        initial_command + python_call + mg_directory + "/bin/mg5_aMC " + temp_proc_card_file, log_file=log_file
+    )
 
 
 def prepare_run_mg_pythia(
@@ -400,7 +402,9 @@ def run_mg_pythia(
 
     # Python 2 support
     python_call = "python2 " if explicit_python_call else ""
-    _ = call_command(initial_command + python_call + mg_directory + "/bin/mg5_aMC " + proc_card_filename, log_file=log_file)
+    _ = call_command(
+        initial_command + python_call + mg_directory + "/bin/mg5_aMC " + proc_card_filename, log_file=log_file
+    )
 
 
 def copy_ufo_model(ufo_directory, mg_directory):

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 EMAIL = 'johann.brehmer@nyu.edu'
 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.2.5'
+VERSION = '0.2.6'
 
 # What packages are required for this module to be executed?
 REQUIRED = [