Update to v2.6.3.2

Signed-off-by: JP-Ellis <josh@jpellis.me>

5 files changed, 364 insertions, 328 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebf61b87a754..21d140b9bb9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu May 31 00:35:53 UTC 2018
+# Tue Jun 26 02:53:56 UTC 2018
 pkgbase = madgraph
 	pkgdesc = MadGraph5_aMC@NLO is a framework that aims at providing all the elements necessary for SM and BSM phenomenology
-	pkgver = 2.6.2
+	pkgver = 2.6.3.2
 	pkgrel = 1
 	url = https://launchpad.net/mg5amcnlo
 	arch = i686
@@ -22,12 +22,14 @@ pkgbase = madgraph
 	optdepends = madgraph-pythia-pgs
 	optdepends = madgraph-pythia8-interface
 	options = !strip
-	source = https://launchpad.net/mg5amcnlo/2.0/2.6.x/+download/MG5_aMC_v2.6.2.tar.gz
+	source = https://launchpad.net/mg5amcnlo/2.0/2.6.x/+download/MG5_aMC_v2.6.3.2.tar.gz
 	source = python2.patch
+	source = gcc8.patch
 	source = mg5_configuration.patch
-	sha256sums = fab5a4d55aac407492ec2a3a70bdadeaea71a43d7bfecbd47ae1317d7abebb20
-	sha256sums = fd8c41acaf6406e9ad009d0bbb8b79c5e25464971cfe6ebccc143f3d9f8aaec5
-	sha256sums = d23918cb78db3105cb616e585f52de28105acea5a2ad0af44fae7a31554ee46f
+	sha256sums = 834c9bcb98e21c214d5287f0dab65a982914a5c388173bcedd32d0d25c739f50
+	sha256sums = f1f90b0b470b2ea97e4c9ad2f9c15085d4ef6479c1a94ceb71a8078ec79ff1b8
+	sha256sums = 3031fff92bcb616e2d53ef206341355e63130ccc9e23f77ce8d1baf98fdb90db
+	sha256sums = a251d1bc6be29032c051cde8b0d050330b4777ff94fea6df5a495a9506c4eadc
 
 pkgname = madgraph
 
diff --git a/PKGBUILD b/PKGBUILD
index 2d091cf36b1e..741633916a9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,10 @@
 # Maintainer: JP-Ellis <josh@jpellis.me>
 
 pkgname=madgraph
-pkgver=2.6.2
+pkgver=2.6.3.2
+_major=${pkgver%%.*}
+_minor=${pkgver#2.}
+_minor=${_minor%%.*}
 _dirname="MG5_aMC_v${pkgver//./_}"
 pkgrel=1
 pkgdesc="MadGraph5_aMC@NLO is a framework that aims at providing all the elements necessary for SM and BSM phenomenology"
@@ -25,17 +28,22 @@ optdepends=(
     'madgraph-pythia-pgs'
     'madgraph-pythia8-interface'
 )
-source=("https://launchpad.net/mg5amcnlo/${pkgver%%.*}.0/${pkgver%.*}.x/+download/MG5_aMC_v${pkgver}.tar.gz"
+source=("https://launchpad.net/mg5amcnlo/${_major}.0/${_major}.${_minor}.x/+download/MG5_aMC_v${pkgver}.tar.gz"
         "python2.patch"
+        "gcc8.patch"
         "mg5_configuration.patch")
-sha256sums=('fab5a4d55aac407492ec2a3a70bdadeaea71a43d7bfecbd47ae1317d7abebb20'
-            'fd8c41acaf6406e9ad009d0bbb8b79c5e25464971cfe6ebccc143f3d9f8aaec5'
-            'd23918cb78db3105cb616e585f52de28105acea5a2ad0af44fae7a31554ee46f')
+sha256sums=('834c9bcb98e21c214d5287f0dab65a982914a5c388173bcedd32d0d25c739f50'
+            'f1f90b0b470b2ea97e4c9ad2f9c15085d4ef6479c1a94ceb71a8078ec79ff1b8'
+            '3031fff92bcb616e2d53ef206341355e63130ccc9e23f77ce8d1baf98fdb90db'
+            'a251d1bc6be29032c051cde8b0d050330b4777ff94fea6df5a495a9506c4eadc')
 options=("!strip")
 
 prepare() {
     msg2 "Fixing python references for python2"
-    patch -p 1 < python2.patch
+    patch -p 1 -d $_dirname < python2.patch
+
+    msg2 "Patching for GCC 8"
+    patch -p 1 -d $_dirname < gcc8.patch
 
     msg2 "Extracting documentation"
     cd "${srcdir}/${_dirname}"
@@ -64,7 +72,7 @@ build() {
     rm $tmpfile
 
     msg2 "Updating configuration file"
-    patch -p 1 < mg5_configuration.patch
+    patch -p 1 -d $_dirname < mg5_configuration.patch
 }
 
 package() {
diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644
index 000000000000..a16230dd1de0
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,14 @@
+diff -u Template/LO/SubProcesses/genps.f Template/LO/SubProcesses/genps.f
+--- a/Template/LO/SubProcesses/genps.f
++++ b/Template/LO/SubProcesses/genps.f
+@@ -41,7 +41,7 @@
+       integer mincfig,maxcfig                  !Range of configurations
+       integer invar
+       double precision wgt                     !(input and output)
+-      double precision x(maxdim),p(maxdim)     !x,p (output) [p(0:3,nexternal)]
++      double precision x(maxdim),p(*)          !x,p (output) [p(0:3,nexternal)]
+ c
+ c     Local
+ c
+
+Diff finished.  Tue Jun 26 11:32:30 2018
diff --git a/mg5_configuration.patch b/mg5_configuration.patch
index 940de26dbf18..7e0f21016ee6 100644
--- a/mg5_configuration.patch
+++ b/mg5_configuration.patch
@@ -1,6 +1,6 @@
-diff --git a/MG5_aMC_v2_6_2/input/mg5_configuration.txt b/MG5_aMC_v2_6_2/input/mg5_configuration.txt
---- a/MG5_aMC_v2_6_2/input/mg5_configuration.txt
-+++ b/MG5_aMC_v2_6_2/input/mg5_configuration.txt
+diff --git a/input/mg5_configuration.txt b/input/mg5_configuration.txt
+--- a/input/mg5_configuration.txt
++++ b/input/mg5_configuration.txt
 @@ -45,11 +45,11 @@
  
  #! Prefered WebBrower
diff --git a/python2.patch b/python2.patch
index 94d80abe47d6..b45343ed0839 100644
--- a/python2.patch
+++ b/python2.patch
@@ -1,541 +1,553 @@
-diff --git a/MG5_aMC_v2_6_2/MadSpin/decay.py b/MG5_aMC_v2_6_2/MadSpin/decay.py
---- a/MG5_aMC_v2_6_2/MadSpin/decay.py
-+++ b/MG5_aMC_v2_6_2/MadSpin/decay.py
+diff -ur aloha/bin/aloha aloha/bin/aloha
+--- a/aloha/bin/aloha
++++ b/aloha/bin/aloha
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#! /usr/bin/env python
 +#!/usr/bin/env python2
  
- from __future__ import division
- from madgraph.interface import reweight_interface
-diff --git a/MG5_aMC_v2_6_2/MadSpin/madspin b/MG5_aMC_v2_6_2/MadSpin/madspin
---- a/MG5_aMC_v2_6_2/MadSpin/madspin
-+++ b/MG5_aMC_v2_6_2/MadSpin/madspin
+ 
+ import sys
+diff -ur bin/.compile.py bin/.compile.py
+--- a/bin/.compile.py
++++ b/bin/.compile.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
- 
  ################################################################################
  #
-diff --git a/MG5_aMC_v2_6_2/Template/LO/bin/generate_events b/MG5_aMC_v2_6_2/Template/LO/bin/generate_events
---- a/MG5_aMC_v2_6_2/Template/LO/bin/generate_events
-+++ b/MG5_aMC_v2_6_2/Template/LO/bin/generate_events
+ # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur bin/mg5 bin/mg5
+--- a/bin/mg5
++++ b/bin/mg5
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
+ 
  ################################################################################
  #
- # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/Template/LO/bin/internal/Gridpack/gridrun b/MG5_aMC_v2_6_2/Template/LO/bin/internal/Gridpack/gridrun
---- a/MG5_aMC_v2_6_2/Template/LO/bin/internal/Gridpack/gridrun
-+++ b/MG5_aMC_v2_6_2/Template/LO/bin/internal/Gridpack/gridrun
+diff -ur bin/mg5_aMC bin/mg5_aMC
+--- a/bin/mg5_aMC
++++ b/bin/mg5_aMC
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
+ import time
+ start = time.time()
  
+diff -ur madgraph/interface/common_run_interface.py madgraph/interface/common_run_interface.py
+--- a/madgraph/interface/common_run_interface.py
++++ b/madgraph/interface/common_run_interface.py
+@@ -907,7 +907,7 @@
+                 fsock.close()
+                 return
+             else:
+-                subprocess.call(['python', 'write_param_card.py'],
++                subprocess.call(['python2', 'write_param_card.py'],
+                              cwd=pjoin(self.me_dir,'bin','internal','ufomodel'))
+                 default = pjoin(self.me_dir,'bin','internal','ufomodel','param_card.dat')
+ 
+diff -ur madgraph/iolibs/gen_infohtml.py madgraph/iolibs/gen_infohtml.py
+--- a/madgraph/iolibs/gen_infohtml.py
++++ b/madgraph/iolibs/gen_infohtml.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/env python2
  ################################################################################
  #
-diff --git a/MG5_aMC_v2_6_2/Template/LO/bin/internal/addmasses_optional.py b/MG5_aMC_v2_6_2/Template/LO/bin/internal/addmasses_optional.py
---- a/MG5_aMC_v2_6_2/Template/LO/bin/internal/addmasses_optional.py
-+++ b/MG5_aMC_v2_6_2/Template/LO/bin/internal/addmasses_optional.py
+ # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc
+--- a/madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc
++++ b/madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc
 @@ -1,4 +1,4 @@
--#!/usr/bin/python
+-#! /usr/bin/env python
 +#!/usr/bin/env python2
- #
- # doubleswitch.py
- # Author: Stephen Mrenna
-diff --git a/MG5_aMC_v2_6_2/Template/LO/bin/madevent b/MG5_aMC_v2_6_2/Template/LO/bin/madevent
---- a/MG5_aMC_v2_6_2/Template/LO/bin/madevent
-+++ b/MG5_aMC_v2_6_2/Template/LO/bin/madevent
+ 
+ # This is an example of how to run MadLoop from Python using the f2py compilation of the wrapper file 'f2py_wrapper.f'.
+ 
+diff -ur madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc
+--- a/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc
++++ b/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  
- ################################################################################
- #
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/Info.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/Info.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/Info.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/Info.py
+ # This is an example of how to run MadLoop from Python using the f2py compilation of the wrapper file 'f2py_wrapper.f'.
+ 
+diff -ur madgraph/madweight/blob_solution.py madgraph/madweight/blob_solution.py
+--- a/madgraph/madweight/blob_solution.py
++++ b/madgraph/madweight/blob_solution.py
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python

+-#!/usr/bin/env python
 +#!/usr/bin/env python2
- 

- def giveInfo(class_):

-         if type(class_)!=str:

-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/clean.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/clean.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/clean.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/clean.py
+ 
+ try:
+     import madgraph.madweight.particle_class as particle_class
+diff -ur madgraph/madweight/Cards.py madgraph/madweight/Cards.py
+--- a/madgraph/madweight/Cards.py
++++ b/madgraph/madweight/Cards.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  ##########################################################################
  ##                                                                      ##
  ##                               MadWeight                              ##
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/expand_MadWeight.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/expand_MadWeight.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/expand_MadWeight.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/expand_MadWeight.py
+diff -ur madgraph/madweight/change_tf.py madgraph/madweight/change_tf.py
+--- a/madgraph/madweight/change_tf.py
++++ b/madgraph/madweight/change_tf.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  
- # Module
- import string
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/madweight.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/madweight.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/madweight.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/madweight.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
+ #Extension
  
- # idea have 2 script
- # madweight.py -> direct submission 
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/put_banner.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/put_banner.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/put_banner.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/put_banner.py
+diff -ur madgraph/madweight/create_param.py madgraph/madweight/create_param.py
+--- a/madgraph/madweight/create_param.py
++++ b/madgraph/madweight/create_param.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  ##########################################################################
  ##                                                                      ##
- ##                               MG/ME/MW                               ##
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/splitbanner.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/splitbanner.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/splitbanner.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/splitbanner.py
+ ##                               MadWeight                              ##
+diff -ur madgraph/madweight/create_run.py madgraph/madweight/create_run.py
+--- a/madgraph/madweight/create_run.py
++++ b/madgraph/madweight/create_run.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
- ##########################################################################
- ##                                                                      ##
- ##                               MadWeight                              ##
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/Python/tests.py b/MG5_aMC_v2_6_2/Template/MadWeight/Python/tests.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/Python/tests.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/Python/tests.py
+ 
+ #Extension
+ import string,os,sys,re,popen2,time,stat,filecmp
+diff -ur madgraph/madweight/diagram_class.py madgraph/madweight/diagram_class.py
+--- a/madgraph/madweight/diagram_class.py
++++ b/madgraph/madweight/diagram_class.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import sys
+ import logging
+diff -ur madgraph/madweight/mod_file.py madgraph/madweight/mod_file.py
+--- a/madgraph/madweight/mod_file.py
++++ b/madgraph/madweight/mod_file.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python 
 +#!/usr/bin/env python2
  ####################################################################################################
  ####################################################################################################
  ##                                                                                                ##
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/bin/madweight.py b/MG5_aMC_v2_6_2/Template/MadWeight/bin/madweight.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/bin/madweight.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/bin/madweight.py
+diff -ur madgraph/madweight/MW_driver.py madgraph/madweight/MW_driver.py
+--- a/madgraph/madweight/MW_driver.py
++++ b/madgraph/madweight/MW_driver.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  ################################################################################
+ # Copyright (c) 2012 The MadGraph Development team and Contributors             
  #
- # Copyright (c) 2011 The MadGraph Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/bin/mw_options b/MG5_aMC_v2_6_2/Template/MadWeight/bin/mw_options
---- a/MG5_aMC_v2_6_2/Template/MadWeight/bin/mw_options
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/bin/mw_options
+diff -ur madgraph/madweight/MW_info.py madgraph/madweight/MW_info.py
+--- a/madgraph/madweight/MW_info.py
++++ b/madgraph/madweight/MW_info.py
 @@ -1,4 +1,4 @@
--#! /usr/bin/env python
+-#!/usr/bin/env python
 +#!/usr/bin/env python2
- 
- ################################################################################
- #
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/check_model.py b/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/check_model.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/check_model.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/check_model.py
+ ##########################################################################
+ ##                                                                      ##
+ ##                               MadWeight                              ##
+diff -ur madgraph/madweight/substructure_class.py madgraph/madweight/substructure_class.py
+--- a/madgraph/madweight/substructure_class.py
++++ b/madgraph/madweight/substructure_class.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  
- #test
  
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_file.py b/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_file.py
---- a/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_file.py
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_file.py
+ try:
+diff -ur madgraph/madweight/verif_event.py madgraph/madweight/verif_event.py
+--- a/madgraph/madweight/verif_event.py
++++ b/madgraph/madweight/verif_event.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ ##########################################################################
+ ##                                                                      ##
+ ##                               MadWeight                              ##
+diff -ur madgraph/madweight/write_MadWeight.py madgraph/madweight/write_MadWeight.py
+--- a/madgraph/madweight/write_MadWeight.py
++++ b/madgraph/madweight/write_MadWeight.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
+ ##### -*- coding: cp1252 -*-
  
  #Extension
- import string
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_setup_model b/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_setup_model
---- a/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_setup_model
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/mod_file/mod_setup_model
-@@ -45,7 +45,7 @@ close(INPUT);
- 
-         if (-e $tfdir."/TF_".$transfer_fct.".dat") {
-       print "TF $transfer_fct found  in $tfdir \n";
--      system("python ./bin/change_tf.py $transfer_fct 0");
-+      system("python2 ./bin/change_tf.py $transfer_fct 0");
-       }
-         else{print "Error Transfer function $transfer_fct not found \n";
-           exit;
-diff --git a/MG5_aMC_v2_6_2/Template/MadWeight/src/makefile b/MG5_aMC_v2_6_2/Template/MadWeight/src/makefile
---- a/MG5_aMC_v2_6_2/Template/MadWeight/src/makefile
-+++ b/MG5_aMC_v2_6_2/Template/MadWeight/src/makefile
-@@ -24,9 +24,9 @@ $(PROG): $(PROCESS) $(MW_PS)  makefile $(LIBS)
- 	$(FC) $(FFLAGS) -o $(PROG) $(PROCESS) $(MW_PS) $(LINKLIBS)
- 
- transfer_card.inc:../../Cards/transfer_card.dat ../../Cards/MadWeight_card.dat
--	python ../../bin/internal/madweight/Cards.py
-+	python2 ../../bin/internal/madweight/Cards.py
- madweight_card.inc:../../Cards/transfer_card.dat ../../Cards/MadWeight_card.dat
--	python ../../bin/internal/madweight/Cards.py
-+	python2 ../../bin/internal/madweight/Cards.py
- 
- driver.o: phasespace.inc nexternal.inc data.inc coupl.inc madweight_card.inc nb_tf.inc
- initialization.o: madweight_card.inc TF_param.inc coupl.inc run.inc madweight_param.inc pmass.inc nexternal.inc maxamps.inc leshouche.inc nb_tf.inc
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/Utilities/NLO_Born3.py b/MG5_aMC_v2_6_2/Template/NLO/Utilities/NLO_Born3.py
---- a/MG5_aMC_v2_6_2/Template/NLO/Utilities/NLO_Born3.py
-+++ b/MG5_aMC_v2_6_2/Template/NLO/Utilities/NLO_Born3.py
+diff -ur madgraph/various/combine_plots.py madgraph/various/combine_plots.py
+--- a/madgraph/various/combine_plots.py
++++ b/madgraph/various/combine_plots.py
 @@ -1,4 +1,4 @@
--#! /usr/bin/env python
+-#!/usr/bin/env python

 +#!/usr/bin/env python2
- 
- inp = open('./MADatNLO.top', 'r')
- out = open('./MADatNLO_combined.top', 'w')
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py b/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py
---- a/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py
-+++ b/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py
+ ################################################################################

+ #

+ # Copyright (c) 2013 The MadGraph5_aMC@NLO Development team and Contributors

+diff -ur madgraph/various/histograms.py madgraph/various/histograms.py
+--- a/madgraph/various/histograms.py
++++ b/madgraph/various/histograms.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
- 
  ################################################################################
  #
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py b/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py
---- a/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py
-+++ b/MG5_aMC_v2_6_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py
+ # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur madgraph/various/plot_djrs.py madgraph/various/plot_djrs.py
+--- a/madgraph/various/plot_djrs.py
++++ b/madgraph/various/plot_djrs.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
- 
  ################################################################################
  #
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/bin/aMCatNLO b/MG5_aMC_v2_6_2/Template/NLO/bin/aMCatNLO
---- a/MG5_aMC_v2_6_2/Template/NLO/bin/aMCatNLO
-+++ b/MG5_aMC_v2_6_2/Template/NLO/bin/aMCatNLO
+ # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur madgraph/various/progressbar.py madgraph/various/progressbar.py
+--- a/madgraph/various/progressbar.py
++++ b/madgraph/various/progressbar.py
 @@ -1,4 +1,4 @@
--#! /usr/bin/env python
+-#!/usr/bin/python
 +#!/usr/bin/env python2
- 
- ################################################################################
+ # -*- coding: iso-8859-1 -*-
  #
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/bin/calculate_xsect b/MG5_aMC_v2_6_2/Template/NLO/bin/calculate_xsect
---- a/MG5_aMC_v2_6_2/Template/NLO/bin/calculate_xsect
-+++ b/MG5_aMC_v2_6_2/Template/NLO/bin/calculate_xsect
+ # progressbar  - Text progressbar library for python.
+diff -ur MadSpin/decay.py MadSpin/decay.py
+--- a/MadSpin/decay.py
++++ b/MadSpin/decay.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ from __future__ import division
+ from madgraph.interface import reweight_interface
+diff -ur MadSpin/madspin MadSpin/madspin
+--- a/MadSpin/madspin
++++ b/MadSpin/madspin
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
+ 
  ################################################################################
  #
- # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/bin/generate_events b/MG5_aMC_v2_6_2/Template/NLO/bin/generate_events
---- a/MG5_aMC_v2_6_2/Template/NLO/bin/generate_events
-+++ b/MG5_aMC_v2_6_2/Template/NLO/bin/generate_events
+diff -ur Template/LO/bin/generate_events Template/LO/bin/generate_events
+--- a/Template/LO/bin/generate_events
++++ b/Template/LO/bin/generate_events
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  ################################################################################
  #
  # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/bin/internal/split_jobs.py b/MG5_aMC_v2_6_2/Template/NLO/bin/internal/split_jobs.py
---- a/MG5_aMC_v2_6_2/Template/NLO/bin/internal/split_jobs.py
-+++ b/MG5_aMC_v2_6_2/Template/NLO/bin/internal/split_jobs.py
+diff -ur Template/LO/bin/internal/addmasses_optional.py Template/LO/bin/internal/addmasses_optional.py
+--- a/Template/LO/bin/internal/addmasses_optional.py
++++ b/Template/LO/bin/internal/addmasses_optional.py
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#!/usr/bin/python
 +#!/usr/bin/env python2
- #  MZ, 2012-06-14
- import os
- import sys
-diff --git a/MG5_aMC_v2_6_2/Template/NLO/bin/shower b/MG5_aMC_v2_6_2/Template/NLO/bin/shower
---- a/MG5_aMC_v2_6_2/Template/NLO/bin/shower
-+++ b/MG5_aMC_v2_6_2/Template/NLO/bin/shower
+ #
+ # doubleswitch.py
+ # Author: Stephen Mrenna
+diff -ur Template/LO/bin/internal/Gridpack/gridrun Template/LO/bin/internal/Gridpack/gridrun
+--- a/Template/LO/bin/internal/Gridpack/gridrun
++++ b/Template/LO/bin/internal/Gridpack/gridrun
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
+ 
  ################################################################################
  #
- # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/aloha/bin/aloha b/MG5_aMC_v2_6_2/aloha/bin/aloha
---- a/MG5_aMC_v2_6_2/aloha/bin/aloha
-+++ b/MG5_aMC_v2_6_2/aloha/bin/aloha
+diff -ur Template/LO/bin/madevent Template/LO/bin/madevent
+--- a/Template/LO/bin/madevent
++++ b/Template/LO/bin/madevent
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  
- 
- import sys
-diff --git a/MG5_aMC_v2_6_2/bin/.compile.py b/MG5_aMC_v2_6_2/bin/.compile.py
---- a/MG5_aMC_v2_6_2/bin/.compile.py
-+++ b/MG5_aMC_v2_6_2/bin/.compile.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python2
  ################################################################################
  #
- # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/bin/mg5 b/MG5_aMC_v2_6_2/bin/mg5
---- a/MG5_aMC_v2_6_2/bin/mg5
-+++ b/MG5_aMC_v2_6_2/bin/mg5
+diff -ur Template/MadWeight/bin/madweight.py Template/MadWeight/bin/madweight.py
+--- a/Template/MadWeight/bin/madweight.py
++++ b/Template/MadWeight/bin/madweight.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
- 
  ################################################################################
  #
-diff --git a/MG5_aMC_v2_6_2/bin/mg5_aMC b/MG5_aMC_v2_6_2/bin/mg5_aMC
---- a/MG5_aMC_v2_6_2/bin/mg5_aMC
-+++ b/MG5_aMC_v2_6_2/bin/mg5_aMC
+ # Copyright (c) 2011 The MadGraph Development team and Contributors
+diff -ur Template/MadWeight/bin/mw_options Template/MadWeight/bin/mw_options
+--- a/Template/MadWeight/bin/mw_options
++++ b/Template/MadWeight/bin/mw_options
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
- import time
- start = time.time()
  
-diff --git a/MG5_aMC_v2_6_2/madgraph/iolibs/gen_infohtml.py b/MG5_aMC_v2_6_2/madgraph/iolibs/gen_infohtml.py
---- a/MG5_aMC_v2_6_2/madgraph/iolibs/gen_infohtml.py
-+++ b/MG5_aMC_v2_6_2/madgraph/iolibs/gen_infohtml.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python2
  ################################################################################
  #
- # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc b/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc
---- a/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc
-+++ b/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc
+diff -ur Template/MadWeight/mod_file/check_model.py Template/MadWeight/mod_file/check_model.py
+--- a/Template/MadWeight/mod_file/check_model.py
++++ b/Template/MadWeight/mod_file/check_model.py
 @@ -1,4 +1,4 @@
--#! /usr/bin/env python
+-#!/usr/bin/env python
 +#!/usr/bin/env python2
  
- # This is an example of how to run MadLoop from Python using the f2py compilation of the wrapper file 'f2py_wrapper.f'.
+ #test
  
-diff --git a/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc b/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc
---- a/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc
-+++ b/MG5_aMC_v2_6_2/madgraph/iolibs/template_files/loop_optimized/check_sa_all.py.inc
+diff -ur Template/MadWeight/mod_file/mod_file.py Template/MadWeight/mod_file/mod_file.py
+--- a/Template/MadWeight/mod_file/mod_file.py
++++ b/Template/MadWeight/mod_file/mod_file.py
 @@ -1,4 +1,4 @@
--#! /usr/bin/env python
+-#!/usr/bin/env python
 +#!/usr/bin/env python2
  
- # This is an example of how to run MadLoop from Python using the f2py compilation of the wrapper file 'f2py_wrapper.f'.
+ #Extension
+ import string
+diff -ur Template/MadWeight/mod_file/mod_setup_model Template/MadWeight/mod_file/mod_setup_model
+--- a/Template/MadWeight/mod_file/mod_setup_model
++++ b/Template/MadWeight/mod_file/mod_setup_model
+@@ -45,7 +45,7 @@
  
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/Cards.py b/MG5_aMC_v2_6_2/madgraph/madweight/Cards.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/Cards.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/Cards.py
+         if (-e $tfdir."/TF_".$transfer_fct.".dat") {
+       print "TF $transfer_fct found  in $tfdir \n";
+-      system("python ./bin/change_tf.py $transfer_fct 0");
++++ b/     system("python2 ./bin/change_tf.py $transfer_fct 0");
+       }
+         else{print "Error Transfer function $transfer_fct not found \n";
+           exit;
+diff -ur Template/MadWeight/Python/clean.py Template/MadWeight/Python/clean.py
+--- a/Template/MadWeight/Python/clean.py
++++ b/Template/MadWeight/Python/clean.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  ##########################################################################
  ##                                                                      ##
  ##                               MadWeight                              ##
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/MW_driver.py b/MG5_aMC_v2_6_2/madgraph/madweight/MW_driver.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/MW_driver.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/MW_driver.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python2
- ################################################################################
- # Copyright (c) 2012 The MadGraph Development team and Contributors             
- #
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/MW_info.py b/MG5_aMC_v2_6_2/madgraph/madweight/MW_info.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/MW_info.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/MW_info.py
+diff -ur Template/MadWeight/Python/expand_MadWeight.py Template/MadWeight/Python/expand_MadWeight.py
+--- a/Template/MadWeight/Python/expand_MadWeight.py
++++ b/Template/MadWeight/Python/expand_MadWeight.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
- ##########################################################################
- ##                                                                      ##
- ##                               MadWeight                              ##
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/blob_solution.py b/MG5_aMC_v2_6_2/madgraph/madweight/blob_solution.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/blob_solution.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/blob_solution.py
+ 
+ # Module
+ import string
+diff -ur Template/MadWeight/Python/Info.py Template/MadWeight/Python/Info.py
+--- a/Template/MadWeight/Python/Info.py
++++ b/Template/MadWeight/Python/Info.py
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python

 +#!/usr/bin/env python2
- 
- try:
-     import madgraph.madweight.particle_class as particle_class
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/change_tf.py b/MG5_aMC_v2_6_2/madgraph/madweight/change_tf.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/change_tf.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/change_tf.py
+ 

+ def giveInfo(class_):

+         if type(class_)!=str:

+diff -ur Template/MadWeight/Python/madweight.py Template/MadWeight/Python/madweight.py
+--- a/Template/MadWeight/Python/madweight.py
++++ b/Template/MadWeight/Python/madweight.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  
- #Extension
- 
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/create_param.py b/MG5_aMC_v2_6_2/madgraph/madweight/create_param.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/create_param.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/create_param.py
+ # idea have 2 script
+ # madweight.py -> direct submission 
+diff -ur Template/MadWeight/Python/put_banner.py Template/MadWeight/Python/put_banner.py
+--- a/Template/MadWeight/Python/put_banner.py
++++ b/Template/MadWeight/Python/put_banner.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  ##########################################################################
  ##                                                                      ##
- ##                               MadWeight                              ##
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/create_run.py b/MG5_aMC_v2_6_2/madgraph/madweight/create_run.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/create_run.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/create_run.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- #Extension
- import string,os,sys,re,popen2,time,stat,filecmp
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/diagram_class.py b/MG5_aMC_v2_6_2/madgraph/madweight/diagram_class.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/diagram_class.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/diagram_class.py
+ ##                               MG/ME/MW                               ##
+diff -ur Template/MadWeight/Python/splitbanner.py Template/MadWeight/Python/splitbanner.py
+--- a/Template/MadWeight/Python/splitbanner.py
++++ b/Template/MadWeight/Python/splitbanner.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
- 
- import sys
- import logging
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/mod_file.py b/MG5_aMC_v2_6_2/madgraph/madweight/mod_file.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/mod_file.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/mod_file.py
+ ##########################################################################
+ ##                                                                      ##
+ ##                               MadWeight                              ##
+diff -ur Template/MadWeight/Python/tests.py Template/MadWeight/Python/tests.py
+--- a/Template/MadWeight/Python/tests.py
++++ b/Template/MadWeight/Python/tests.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python 
 +#!/usr/bin/env python2
  ####################################################################################################
  ####################################################################################################
  ##                                                                                                ##
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/substructure_class.py b/MG5_aMC_v2_6_2/madgraph/madweight/substructure_class.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/substructure_class.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/substructure_class.py
+diff -ur Template/MadWeight/src/makefile Template/MadWeight/src/makefile
+--- a/Template/MadWeight/src/makefile
++++ b/Template/MadWeight/src/makefile
+@@ -24,9 +24,9 @@
+ 	$(FC) $(FFLAGS) -o $(PROG) $(PROCESS) $(MW_PS) $(LINKLIBS)
+ 
+ transfer_card.inc:../../Cards/transfer_card.dat ../../Cards/MadWeight_card.dat
+-	python ../../bin/internal/madweight/Cards.py
++
+ madweight_card.inc:../../Cards/transfer_card.dat ../../Cards/MadWeight_card.dat
+-	python ../../bin/internal/madweight/Cards.py
++
+ 
+ driver.o: phasespace.inc nexternal.inc data.inc coupl.inc madweight_card.inc nb_tf.inc
+ initialization.o: madweight_card.inc TF_param.inc coupl.inc run.inc madweight_param.inc pmass.inc nexternal.inc maxamps.inc leshouche.inc nb_tf.inc
+diff -ur Template/NLO/bin/aMCatNLO Template/NLO/bin/aMCatNLO
+--- a/Template/NLO/bin/aMCatNLO
++++ b/Template/NLO/bin/aMCatNLO
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#! /usr/bin/env python
 +#!/usr/bin/env python2
  
- 
- try:
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/verif_event.py b/MG5_aMC_v2_6_2/madgraph/madweight/verif_event.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/verif_event.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/verif_event.py
+ ################################################################################
+ #
+diff -ur Template/NLO/bin/calculate_xsect Template/NLO/bin/calculate_xsect
+--- a/Template/NLO/bin/calculate_xsect
++++ b/Template/NLO/bin/calculate_xsect
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#! /usr/bin/env python
 +#!/usr/bin/env python2
- ##########################################################################
- ##                                                                      ##
- ##                               MadWeight                              ##
-diff --git a/MG5_aMC_v2_6_2/madgraph/madweight/write_MadWeight.py b/MG5_aMC_v2_6_2/madgraph/madweight/write_MadWeight.py
---- a/MG5_aMC_v2_6_2/madgraph/madweight/write_MadWeight.py
-+++ b/MG5_aMC_v2_6_2/madgraph/madweight/write_MadWeight.py
+ ################################################################################
+ #
+ # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur Template/NLO/bin/generate_events Template/NLO/bin/generate_events
+--- a/Template/NLO/bin/generate_events
++++ b/Template/NLO/bin/generate_events
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#! /usr/bin/env python
 +#!/usr/bin/env python2
- ##### -*- coding: cp1252 -*-
- 
- #Extension
-diff --git a/MG5_aMC_v2_6_2/madgraph/various/combine_plots.py b/MG5_aMC_v2_6_2/madgraph/various/combine_plots.py
---- a/MG5_aMC_v2_6_2/madgraph/various/combine_plots.py
-+++ b/MG5_aMC_v2_6_2/madgraph/various/combine_plots.py
+ ################################################################################
+ #
+ # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur Template/NLO/bin/internal/split_jobs.py Template/NLO/bin/internal/split_jobs.py
+--- a/Template/NLO/bin/internal/split_jobs.py
++++ b/Template/NLO/bin/internal/split_jobs.py
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python

+-#!/usr/bin/env python
 +#!/usr/bin/env python2
- ################################################################################

- #

- # Copyright (c) 2013 The MadGraph5_aMC@NLO Development team and Contributors

-diff --git a/MG5_aMC_v2_6_2/madgraph/various/histograms.py b/MG5_aMC_v2_6_2/madgraph/various/histograms.py
---- a/MG5_aMC_v2_6_2/madgraph/various/histograms.py
-+++ b/MG5_aMC_v2_6_2/madgraph/various/histograms.py
+ #  MZ, 2012-06-14
+ import os
+ import sys
+diff -ur Template/NLO/bin/shower Template/NLO/bin/shower
+--- a/Template/NLO/bin/shower
++++ b/Template/NLO/bin/shower
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  ################################################################################
  #
- # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/madgraph/various/plot_djrs.py b/MG5_aMC_v2_6_2/madgraph/various/plot_djrs.py
---- a/MG5_aMC_v2_6_2/madgraph/various/plot_djrs.py
-+++ b/MG5_aMC_v2_6_2/madgraph/various/plot_djrs.py
+ # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors
+diff -ur Template/NLO/Utilities/NLO_Born3.py Template/NLO/Utilities/NLO_Born3.py
+--- a/Template/NLO/Utilities/NLO_Born3.py
++++ b/Template/NLO/Utilities/NLO_Born3.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/env python2
+ 
+ inp = open('./MADatNLO.top', 'r')
+ out = open('./MADatNLO_combined.top', 'w')
+diff -ur Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py
+--- a/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py
++++ b/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
+ 
  ################################################################################
  #
- # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/madgraph/various/progressbar.py b/MG5_aMC_v2_6_2/madgraph/various/progressbar.py
---- a/MG5_aMC_v2_6_2/madgraph/various/progressbar.py
-+++ b/MG5_aMC_v2_6_2/madgraph/various/progressbar.py
+diff -ur Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py
+--- a/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py
++++ b/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py
 @@ -1,4 +1,4 @@
--#!/usr/bin/python
+-#! /usr/bin/env python
 +#!/usr/bin/env python2
- # -*- coding: iso-8859-1 -*-
+ 
+ ################################################################################
  #
- # progressbar  - Text progressbar library for python.
-diff --git a/MG5_aMC_v2_6_2/tests/acceptance_tests/test_histograms.py b/MG5_aMC_v2_6_2/tests/acceptance_tests/test_histograms.py
---- a/MG5_aMC_v2_6_2/tests/acceptance_tests/test_histograms.py
-+++ b/MG5_aMC_v2_6_2/tests/acceptance_tests/test_histograms.py
-@@ -47,5 +47,4 @@ class IOTest_Histogram(IOTests.IOTestManager):
+diff -ur tests/acceptance_tests/test_histograms.py tests/acceptance_tests/test_histograms.py
+--- a/tests/acceptance_tests/test_histograms.py
++++ b/tests/acceptance_tests/test_histograms.py
+@@ -47,5 +47,4 @@
            histo_list.output(pjoin('%s','HistoOut'), format = 'gnuplot');
          ''' % (sys.path, _file_path, self.IOpath)
  
 -        os.system('echo "%s" | python' % line) 
 -
-+        os.system('echo "%s" | python2' % line)
-diff --git a/MG5_aMC_v2_6_2/tests/acceptance_tests/test_model_equivalence.py b/MG5_aMC_v2_6_2/tests/acceptance_tests/test_model_equivalence.py
---- a/MG5_aMC_v2_6_2/tests/acceptance_tests/test_model_equivalence.py
-+++ b/MG5_aMC_v2_6_2/tests/acceptance_tests/test_model_equivalence.py
-@@ -323,7 +323,7 @@ class TestModelCreation(unittest.TestCase, CheckFileCreate):
++++ b/       os.system('echo "%s" | python2' % line)
+diff -ur tests/acceptance_tests/test_model_equivalence.py tests/acceptance_tests/test_model_equivalence.py
+--- a/tests/acceptance_tests/test_model_equivalence.py
++++ b/tests/acceptance_tests/test_model_equivalence.py
+@@ -323,7 +323,7 @@
              pass
          # prepare for a local compilation
          
 -        subprocess.call(['python','write_param_card.py'], cwd=os.path.join(MG5DIR,'models','sm'),
-+        subprocess.call(['python2','write_param_card.py'], cwd=os.path.join(MG5DIR,'models','sm'),
++++ b/       subprocess.call(['python2','write_param_card.py'], cwd=os.path.join(MG5DIR,'models','sm'),
                          stdout=subprocess.PIPE)
          files.cp(os.path.join(MG5DIR,'models','sm','param_card.dat'),
                   join('param_card.dat'))
-diff --git a/MG5_aMC_v2_6_2/tests/parallel_tests/loop_sample_script.py b/MG5_aMC_v2_6_2/tests/parallel_tests/loop_sample_script.py
---- a/MG5_aMC_v2_6_2/tests/parallel_tests/loop_sample_script.py
-+++ b/MG5_aMC_v2_6_2/tests/parallel_tests/loop_sample_script.py
+diff -ur tests/parallel_tests/loop_sample_script.py tests/parallel_tests/loop_sample_script.py
+--- a/tests/parallel_tests/loop_sample_script.py
++++ b/tests/parallel_tests/loop_sample_script.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  ################################################################################
  #
  # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/tests/parallel_tests/sample_script.py b/MG5_aMC_v2_6_2/tests/parallel_tests/sample_script.py
---- a/MG5_aMC_v2_6_2/tests/parallel_tests/sample_script.py
-+++ b/MG5_aMC_v2_6_2/tests/parallel_tests/sample_script.py
+diff -ur tests/parallel_tests/sample_script.py tests/parallel_tests/sample_script.py
+--- a/tests/parallel_tests/sample_script.py
++++ b/tests/parallel_tests/sample_script.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!/usr/bin/env python2
  ################################################################################
  #
  # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/tests/test_manager.py b/MG5_aMC_v2_6_2/tests/test_manager.py
---- a/MG5_aMC_v2_6_2/tests/test_manager.py
-+++ b/MG5_aMC_v2_6_2/tests/test_manager.py
+diff -ur tests/test_manager.py tests/test_manager.py
+--- a/tests/test_manager.py
++++ b/tests/test_manager.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python 
 +#!/usr/bin/env python2
  ################################################################################
  #
  # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/create.py b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/create.py
---- a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/create.py
-+++ b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/create.py
+diff -ur vendor/IREGI/src/oneloop/create.py vendor/IREGI/src/oneloop/create.py
+--- a/vendor/IREGI/src/oneloop/create.py
++++ b/vendor/IREGI/src/oneloop/create.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  import re,string,os,sys,subprocess
  locdir,thisFile = os.path.split(os.path.abspath(sys.argv[0]))
  srcdir = os.path.join(locdir,'src')
-diff --git a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/example_cpp/create.py b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/example_cpp/create.py
---- a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/example_cpp/create.py
-+++ b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/example_cpp/create.py
+diff -ur vendor/IREGI/src/oneloop/example_cpp/create.py vendor/IREGI/src/oneloop/example_cpp/create.py
+--- a/vendor/IREGI/src/oneloop/example_cpp/create.py
++++ b/vendor/IREGI/src/oneloop/example_cpp/create.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  import re,string,os,sys,subprocess
  locdir,thisFile = os.path.split(os.path.abspath(sys.argv[0]))
  srcdir = os.path.join(locdir,'src')
-diff --git a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_olo.py b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_olo.py
---- a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_olo.py
-+++ b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_olo.py
+diff -ur vendor/IREGI/src/oneloop/src/avh_olo.py vendor/IREGI/src/oneloop/src/avh_olo.py
+--- a/vendor/IREGI/src/oneloop/src/avh_olo.py
++++ b/vendor/IREGI/src/oneloop/src/avh_olo.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  import re,sys
  import avh_pc_olo
  
-diff --git a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py
---- a/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py
-+++ b/MG5_aMC_v2_6_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py
+diff -ur vendor/IREGI/src/oneloop/src/avh_pc_exe.py vendor/IREGI/src/oneloop/src/avh_pc_exe.py
+--- a/vendor/IREGI/src/oneloop/src/avh_pc_exe.py
++++ b/vendor/IREGI/src/oneloop/src/avh_pc_exe.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2