diff options
| author | JP-Ellis | 2017-03-17 17:09:55 +1100 |
|---|---|---|
| committer | JP-Ellis | 2017-03-17 17:09:55 +1100 |
| commit | 211c078911a1169836f0edbecf89c6359cc49d6e (patch) | |
| tree | 495b597f72e6fa9d83da83cf8dbf7097ec8447fe | |
| parent | ba1675d3fffe01c9a47092e2f77e3061e592b8d7 (diff) | |
| download | aur-211c078911a1169836f0edbecf89c6359cc49d6e.tar.gz | |
Upgrade to 2.5.3
Signed-off-by: JP-Ellis <josh@jpellis.me>
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | mg5_configuration.patch | 32 | ||||
| -rw-r--r-- | python2.patch | 542 |
4 files changed, 324 insertions, 289 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Feb 27 12:46:44 UTC 2017 +# Fri Mar 17 06:07:40 UTC 2017 pkgbase = madgraph pkgdesc = MadGraph5_aMC@NLO is a framework that aims at providing all the elements necessary for SM and BSM phenomenology - pkgver = 2.5.2 - pkgrel = 3 + pkgver = 2.5.3 + pkgrel = 1 url = http://madgraph.hep.uiuc.edu/ arch = i686 arch = x86_64 @@ -15,18 +15,19 @@ pkgbase = madgraph depends = tcsh optdepends = delphes optdepends = fastjet + optdepends = golem95 optdepends = hepmc optdepends = lhapdf optdepends = madanalysis5 optdepends = madgraph-pythia-pgs - optdepends = pythia8 + optdepends = madgraph-pythia8-interface options = !strip - source = https://launchpad.net/mg5amcnlo/2.0/2.5.x/+download/MG5_aMC_v2.5.2.tar.gz + source = https://launchpad.net/mg5amcnlo/2.0/2.5.x/+download/MG5_aMC_v2.5.3.tar.gz source = python2.patch source = mg5_configuration.patch - sha256sums = 7968f6d0543b3af2649ba497d17c3a23b089cc6f5ba352e0fd7fa106aa07a512 - sha256sums = b16bcfebae4d50eb145436c97a06daf706691bbef4e7f45cde1c6116d2869720 - sha256sums = 253c66568c16bf4f118c200a76a91f0cca2bf441d880719c8bf583db770cbc28 + sha256sums = 8124ce6152fea32082ce76bc8afe6b618d3d022aa35a566864efdd37a81061c8 + sha256sums = 0b8e1a73b811a15ac2b06d65502f19e7fc64b6a24abd8c2f35474d3443ced2bb + sha256sums = 492329cc4158414c0b9e27d9b053afa04fe3afa2436a0c0b7aa014cafda2429f pkgname = madgraph @@ -1,9 +1,9 @@ # Maintainer: JP-Ellis <josh@jpellis.me> pkgname=madgraph -pkgver=2.5.2 +pkgver=2.5.3 _dirname="MG5_aMC_v${pkgver//./_}" -pkgrel=3 +pkgrel=1 pkgdesc="MadGraph5_aMC@NLO is a framework that aims at providing all the elements necessary for SM and BSM phenomenology" url="http://madgraph.hep.uiuc.edu/" arch=('i686' 'x86_64') @@ -18,35 +18,32 @@ depends=( optdepends=( 'delphes' 'fastjet' + 'golem95' 'hepmc' 'lhapdf' 'madanalysis5' 'madgraph-pythia-pgs' - 'pythia8' + 'madgraph-pythia8-interface' ) source=("https://launchpad.net/mg5amcnlo/${pkgver%%.*}.0/${pkgver%.*}.x/+download/MG5_aMC_v${pkgver}.tar.gz" "python2.patch" "mg5_configuration.patch") -sha256sums=('7968f6d0543b3af2649ba497d17c3a23b089cc6f5ba352e0fd7fa106aa07a512' - 'b16bcfebae4d50eb145436c97a06daf706691bbef4e7f45cde1c6116d2869720' - '253c66568c16bf4f118c200a76a91f0cca2bf441d880719c8bf583db770cbc28') +sha256sums=('8124ce6152fea32082ce76bc8afe6b618d3d022aa35a566864efdd37a81061c8' + '0b8e1a73b811a15ac2b06d65502f19e7fc64b6a24abd8c2f35474d3443ced2bb' + '492329cc4158414c0b9e27d9b053afa04fe3afa2436a0c0b7aa014cafda2429f') options=("!strip") prepare() { msg2 "Fixing python references for python2" patch -p 1 < python2.patch - msg2 "Updating configuration file" - patch -p 1 < mg5_configuration.patch - msg2 "Extracting documentation" cd "${srcdir}/${_dirname}" tar xf doc.tgz rm doc.tgz msg2 "Removing VCS directories" - cd "${srcdir}/${_dirname}" - find . -name "CVS" \ + find "${srcdir}/${_dirname}" -name "CVS" \ -o -name ".svn" \ -o -name ".bzr" -o -name ".bzrignore" \ -o -name ".git" -o -name ".gitignore" \ @@ -65,6 +62,9 @@ build() { echo "exit" > $tmpfile "${srcdir}/${_dirname}/bin/mg5_aMC" $tmpfile 1>/dev/null rm $tmpfile + + msg2 "Updating configuration file" + patch -p 1 < mg5_configuration.patch } package() { diff --git a/mg5_configuration.patch b/mg5_configuration.patch index 1579da3ccef3..7180947826a1 100644 --- a/mg5_configuration.patch +++ b/mg5_configuration.patch @@ -1,5 +1,7 @@ ---- b/MG5_aMC_v2_5_2/input/mg5_configuration.txt -+++ a/MG5_aMC_v2_5_2/input/mg5_configuration.txt +diff --git a/MG5_aMC_v2_5_3/input/mg5_configuration.txt b/MG5_aMC_v2_5_3.patched/input/mg5_configuration.txt +index c089808..a3e85c5 100644 +--- a/MG5_aMC_v2_5_3/input/mg5_configuration.txt ++++ b/MG5_aMC_v2_5_3.patched/input/mg5_configuration.txt @@ -45,11 +45,11 @@ #! Prefered WebBrower @@ -14,7 +16,7 @@ #! Time allowed to answer question (if no answer takes default value) #! 0: No time limit -@@ -59,7 +59,7 @@ +@@ -59,14 +59,14 @@ #! Defines the path to the pythia8 installation directory (i.e. the #! on containing the lib, bin and include directories) . #! If using a relative path, that starts from the mg5 directory @@ -23,6 +25,14 @@ #! MG5aMC_PY8_interface path #! Defines the path of the C++ driver file that is used by MG5_aMC to + #! steer the Pythia8 shower. + #! Can be installed directly from within MG5_aMC with the following command: + #! MG5_aMC> install mg5amc_py8_interface +-# mg5amc_py8_interface_path = ./HEPTools/MG5aMC_PY8_interface ++mg5amc_py8_interface_path = /opt/madgraph/pythia8-interface + + #! Herwig++/Herwig7 paths + #! specify here the paths also to HepMC ant ThePEG @@ -75,14 +75,14 @@ #! WARNING: if Herwig7 has been installed with the bootstrap script, #! then please set thepeg_path and hepmc_path to the same value as @@ -42,7 +52,12 @@ ################################################################################ # INFO FOR MADEVENT / aMC@NLO -@@ -140,15 +140,15 @@ +@@ -136,19 +136,19 @@ + + #! Pythia-PGS Package + #! relative path start from main directory +-# pythia-pgs_path = ./pythia-pgs ++pythia-pgs_path = /opt/madgraph/pythia-pgs #! Delphes Package #! relative path start from main directory @@ -80,3 +95,12 @@ #! MCatNLO-utilities #! relative path starting from main directory +@@ -185,7 +185,7 @@ + #! if auto: try to find it automatically on the system (default) + #! if '' or None: disabling Golem95 + #! if golem=/PATH/TO/golem/lib: use that speficif installation path for Golem95 +-# golem = auto ++golem = /usr/lib + + #! Set the samurai directory containing samurai's library + #! It only supports version higher than 2.0.0 diff --git a/python2.patch b/python2.patch index 929195188452..7fcd2a9b169a 100644 --- a/python2.patch +++ b/python2.patch @@ -1,530 +1,540 @@ -diff --git a/MG5_aMC_v2_5_2/MadSpin/decay.py b/MG5_aMC_v2_5_2/MadSpin/decay.py -index 4416b16..b87415a 100755 ---- a/MG5_aMC_v2_5_2/MadSpin/decay.py -+++ b/MG5_aMC_v2_5_2/MadSpin/decay.py +diff --git a/MG5_aMC_v2_5_3/MadSpin/decay.py b/MG5_aMC_v2_5_3/MadSpin/decay.py +index 495f00e..8042c29 100755 +--- a/MG5_aMC_v2_5_3/MadSpin/decay.py ++++ b/MG5_aMC_v2_5_3/MadSpin/decay.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 from __future__ import division -diff --git a/MG5_aMC_v2_5_2/MadSpin/madspin b/MG5_aMC_v2_5_2/MadSpin/madspin -index 7e36857..b6becb4 100755 ---- a/MG5_aMC_v2_5_2/MadSpin/madspin -+++ b/MG5_aMC_v2_5_2/MadSpin/madspin +diff --git a/MG5_aMC_v2_5_3/MadSpin/madspin b/MG5_aMC_v2_5_3/MadSpin/madspin +index 7e36857..7d21992 100755 +--- a/MG5_aMC_v2_5_3/MadSpin/madspin ++++ b/MG5_aMC_v2_5_3/MadSpin/madspin @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/LO/bin/generate_events b/MG5_aMC_v2_5_2/Template/LO/bin/generate_events -index d01b4a7..925393e 100755 ---- a/MG5_aMC_v2_5_2/Template/LO/bin/generate_events -+++ b/MG5_aMC_v2_5_2/Template/LO/bin/generate_events +diff --git a/MG5_aMC_v2_5_3/Template/LO/bin/generate_events b/MG5_aMC_v2_5_3/Template/LO/bin/generate_events +index d01b4a7..03affb6 100755 +--- a/MG5_aMC_v2_5_3/Template/LO/bin/generate_events ++++ b/MG5_aMC_v2_5_3/Template/LO/bin/generate_events @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/Template/LO/bin/internal/Gridpack/gridrun b/MG5_aMC_v2_5_2/Template/LO/bin/internal/Gridpack/gridrun -index ff6b8c3..3ee293b 100755 ---- a/MG5_aMC_v2_5_2/Template/LO/bin/internal/Gridpack/gridrun -+++ b/MG5_aMC_v2_5_2/Template/LO/bin/internal/Gridpack/gridrun +diff --git a/MG5_aMC_v2_5_3/Template/LO/bin/internal/Gridpack/gridrun b/MG5_aMC_v2_5_3/Template/LO/bin/internal/Gridpack/gridrun +index ff6b8c3..6943f66 100755 +--- a/MG5_aMC_v2_5_3/Template/LO/bin/internal/Gridpack/gridrun ++++ b/MG5_aMC_v2_5_3/Template/LO/bin/internal/Gridpack/gridrun @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/LO/bin/internal/addmasses_optional.py b/MG5_aMC_v2_5_2/Template/LO/bin/internal/addmasses_optional.py -index 10e6f64..a2f3a16 100755 ---- a/MG5_aMC_v2_5_2/Template/LO/bin/internal/addmasses_optional.py -+++ b/MG5_aMC_v2_5_2/Template/LO/bin/internal/addmasses_optional.py +diff --git a/MG5_aMC_v2_5_3/Template/LO/bin/internal/addmasses_optional.py b/MG5_aMC_v2_5_3/Template/LO/bin/internal/addmasses_optional.py +index 10e6f64..12715a1 100755 +--- a/MG5_aMC_v2_5_3/Template/LO/bin/internal/addmasses_optional.py ++++ b/MG5_aMC_v2_5_3/Template/LO/bin/internal/addmasses_optional.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 # # doubleswitch.py # Author: Stephen Mrenna -diff --git a/MG5_aMC_v2_5_2/Template/LO/bin/madevent b/MG5_aMC_v2_5_2/Template/LO/bin/madevent -index 14985c3..1296796 100755 ---- a/MG5_aMC_v2_5_2/Template/LO/bin/madevent -+++ b/MG5_aMC_v2_5_2/Template/LO/bin/madevent +diff --git a/MG5_aMC_v2_5_3/Template/LO/bin/madevent b/MG5_aMC_v2_5_3/Template/LO/bin/madevent +index 14985c3..d5fe2dd 100755 +--- a/MG5_aMC_v2_5_3/Template/LO/bin/madevent ++++ b/MG5_aMC_v2_5_3/Template/LO/bin/madevent @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/Info.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/Info.py -index 92b0e81..99f497f 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/Info.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/Info.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/Info.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/Info.py +index 92b0e81..2b97578 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/Info.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/Info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python
-+#!/usr/bin/env python2 ++#!/usr/bin/python2 def giveInfo(class_):
if type(class_)!=str:
-diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/clean.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/clean.py -index 64a4e35..59d1899 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/clean.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/clean.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/clean.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/clean.py +index 64a4e35..e1c21ae 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/clean.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/clean.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/expand_MadWeight.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/expand_MadWeight.py -index abe4909..35ab543 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/expand_MadWeight.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/expand_MadWeight.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/expand_MadWeight.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/expand_MadWeight.py +index abe4909..0804bfe 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/expand_MadWeight.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/expand_MadWeight.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 # Module import string -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/madweight.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/madweight.py -index 953800d..4dcd048 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/madweight.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/madweight.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/madweight.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/madweight.py +index 953800d..4c0a5c7 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/madweight.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/madweight.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 # idea have 2 script # madweight.py -> direct submission -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/put_banner.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/put_banner.py -index a6a06b8..b0f1ef8 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/put_banner.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/put_banner.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/put_banner.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/put_banner.py +index a6a06b8..6d97608 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/put_banner.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/put_banner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MG/ME/MW ## -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/splitbanner.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/splitbanner.py -index a425a1a..f0e4c4e 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/splitbanner.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/splitbanner.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/splitbanner.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/splitbanner.py +index a425a1a..d563e72 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/splitbanner.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/splitbanner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/Python/tests.py b/MG5_aMC_v2_5_2/Template/MadWeight/Python/tests.py -index f5c4731..1154bc6 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/Python/tests.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/Python/tests.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/tests.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/tests.py +index f5c4731..bee3358 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/Python/tests.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/Python/tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 #################################################################################################### #################################################################################################### ## ## -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/bin/madweight.py b/MG5_aMC_v2_5_2/Template/MadWeight/bin/madweight.py -index c8ac32a..c7247bb 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/bin/madweight.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/bin/madweight.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/bin/madweight.py b/MG5_aMC_v2_5_3/Template/MadWeight/bin/madweight.py +index c8ac32a..bcde9a4 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/bin/madweight.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/bin/madweight.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/bin/mw_options b/MG5_aMC_v2_5_2/Template/MadWeight/bin/mw_options -index 4a28be1..b98d018 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/bin/mw_options -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/bin/mw_options +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/bin/mw_options b/MG5_aMC_v2_5_3/Template/MadWeight/bin/mw_options +index 4a28be1..a1f2aab 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/bin/mw_options ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/bin/mw_options @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/check_model.py b/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/check_model.py -index 8e80f6a..a8a2d26 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/check_model.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/check_model.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/check_model.py b/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/check_model.py +index 8e80f6a..ef363ec 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/check_model.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/check_model.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 #test -diff --git a/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/mod_file.py b/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/mod_file.py -index d95cf20..444933a 100755 ---- a/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/mod_file.py -+++ b/MG5_aMC_v2_5_2/Template/MadWeight/mod_file/mod_file.py +diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/mod_file.py b/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/mod_file.py +index d95cf20..538d209 100755 +--- a/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/mod_file.py ++++ b/MG5_aMC_v2_5_3/Template/MadWeight/mod_file/mod_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 #Extension import string -diff --git a/MG5_aMC_v2_5_2/Template/NLO/Utilities/NLO_Born3.py b/MG5_aMC_v2_5_2/Template/NLO/Utilities/NLO_Born3.py -index dbb8173..c5edaf1 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/Utilities/NLO_Born3.py -+++ b/MG5_aMC_v2_5_2/Template/NLO/Utilities/NLO_Born3.py +diff --git a/MG5_aMC_v2_5_3/Template/NLO/Utilities/NLO_Born3.py b/MG5_aMC_v2_5_3/Template/NLO/Utilities/NLO_Born3.py +index dbb8173..2bd1d8d 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/Utilities/NLO_Born3.py ++++ b/MG5_aMC_v2_5_3/Template/NLO/Utilities/NLO_Born3.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 inp = open('./MADatNLO.top', 'r') out = open('./MADatNLO_combined.top', 'w') -diff --git a/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py b/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py -index f7ba469..fb604a6 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py -+++ b/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py +diff --git a/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py b/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py +index f7ba469..63930b3 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py ++++ b/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py b/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py -index 87a75fa..a5eaa77 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py -+++ b/MG5_aMC_v2_5_2/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py +diff --git a/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py b/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py +index 87a75fa..6025e77 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py ++++ b/MG5_aMC_v2_5_3/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/NLO/bin/aMCatNLO b/MG5_aMC_v2_5_2/Template/NLO/bin/aMCatNLO -index e1a347f..88fd730 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/bin/aMCatNLO -+++ b/MG5_aMC_v2_5_2/Template/NLO/bin/aMCatNLO +diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/aMCatNLO b/MG5_aMC_v2_5_3/Template/NLO/bin/aMCatNLO +index e1a347f..b12e780 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/bin/aMCatNLO ++++ b/MG5_aMC_v2_5_3/Template/NLO/bin/aMCatNLO @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/Template/NLO/bin/calculate_xsect b/MG5_aMC_v2_5_2/Template/NLO/bin/calculate_xsect -index 5000f2a..2616864 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/bin/calculate_xsect -+++ b/MG5_aMC_v2_5_2/Template/NLO/bin/calculate_xsect +diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/calculate_xsect b/MG5_aMC_v2_5_3/Template/NLO/bin/calculate_xsect +index 5000f2a..75f7e9d 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/bin/calculate_xsect ++++ b/MG5_aMC_v2_5_3/Template/NLO/bin/calculate_xsect @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/Template/NLO/bin/generate_events b/MG5_aMC_v2_5_2/Template/NLO/bin/generate_events -index 7302c07..57f68b8 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/bin/generate_events -+++ b/MG5_aMC_v2_5_2/Template/NLO/bin/generate_events +diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/generate_events b/MG5_aMC_v2_5_3/Template/NLO/bin/generate_events +index 7302c07..437f7db 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/bin/generate_events ++++ b/MG5_aMC_v2_5_3/Template/NLO/bin/generate_events @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/Template/NLO/bin/internal/split_jobs.py b/MG5_aMC_v2_5_2/Template/NLO/bin/internal/split_jobs.py -index 0b50e56..7af39a1 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/bin/internal/split_jobs.py -+++ b/MG5_aMC_v2_5_2/Template/NLO/bin/internal/split_jobs.py +diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/internal/split_jobs.py b/MG5_aMC_v2_5_3/Template/NLO/bin/internal/split_jobs.py +index 0b50e56..2153975 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/bin/internal/split_jobs.py ++++ b/MG5_aMC_v2_5_3/Template/NLO/bin/internal/split_jobs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 # MZ, 2012-06-14 import os import sys -diff --git a/MG5_aMC_v2_5_2/Template/NLO/bin/shower b/MG5_aMC_v2_5_2/Template/NLO/bin/shower -index 5bde455..065565b 100755 ---- a/MG5_aMC_v2_5_2/Template/NLO/bin/shower -+++ b/MG5_aMC_v2_5_2/Template/NLO/bin/shower +diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/shower b/MG5_aMC_v2_5_3/Template/NLO/bin/shower +index 5bde455..9e6a04c 100755 +--- a/MG5_aMC_v2_5_3/Template/NLO/bin/shower ++++ b/MG5_aMC_v2_5_3/Template/NLO/bin/shower @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/aloha/bin/aloha b/MG5_aMC_v2_5_2/aloha/bin/aloha -index 2fe8b10..e3b177a 100755 ---- a/MG5_aMC_v2_5_2/aloha/bin/aloha -+++ b/MG5_aMC_v2_5_2/aloha/bin/aloha +diff --git a/MG5_aMC_v2_5_3/aloha/bin/aloha b/MG5_aMC_v2_5_3/aloha/bin/aloha +index 2fe8b10..1e383c2 100755 +--- a/MG5_aMC_v2_5_3/aloha/bin/aloha ++++ b/MG5_aMC_v2_5_3/aloha/bin/aloha @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 import sys -diff --git a/MG5_aMC_v2_5_2/bin/mg5 b/MG5_aMC_v2_5_2/bin/mg5 -index f31c620..f3891c9 100755 ---- a/MG5_aMC_v2_5_2/bin/mg5 -+++ b/MG5_aMC_v2_5_2/bin/mg5 +diff --git a/MG5_aMC_v2_5_3/bin/.compile.py b/MG5_aMC_v2_5_3/bin/.compile.py +index 0f396d6..e194774 100755 +--- a/MG5_aMC_v2_5_3/bin/.compile.py ++++ b/MG5_aMC_v2_5_3/bin/.compile.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 - ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/bin/mg5_aMC b/MG5_aMC_v2_5_2/bin/mg5_aMC -index ca52873..2919edd 100755 ---- a/MG5_aMC_v2_5_2/bin/mg5_aMC -+++ b/MG5_aMC_v2_5_2/bin/mg5_aMC + # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors +diff --git a/MG5_aMC_v2_5_3/bin/mg5 b/MG5_aMC_v2_5_3/bin/mg5 +index f31c620..33e13e9 100755 +--- a/MG5_aMC_v2_5_3/bin/mg5 ++++ b/MG5_aMC_v2_5_3/bin/mg5 @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_2/madgraph/iolibs/gen_infohtml.py b/MG5_aMC_v2_5_2/madgraph/iolibs/gen_infohtml.py -index 52acde6..2bdd639 100755 ---- a/MG5_aMC_v2_5_2/madgraph/iolibs/gen_infohtml.py -+++ b/MG5_aMC_v2_5_2/madgraph/iolibs/gen_infohtml.py +diff --git a/MG5_aMC_v2_5_3/bin/mg5_aMC b/MG5_aMC_v2_5_3/bin/mg5_aMC +index 931cd0b..37e2bc7 100755 +--- a/MG5_aMC_v2_5_3/bin/mg5_aMC ++++ b/MG5_aMC_v2_5_3/bin/mg5_aMC +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python2 + import time + start = time.time() + +diff --git a/MG5_aMC_v2_5_3/madgraph/iolibs/gen_infohtml.py b/MG5_aMC_v2_5_3/madgraph/iolibs/gen_infohtml.py +index 52acde6..ca92075 100755 +--- a/MG5_aMC_v2_5_3/madgraph/iolibs/gen_infohtml.py ++++ b/MG5_aMC_v2_5_3/madgraph/iolibs/gen_infohtml.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc b/MG5_aMC_v2_5_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc -index 3cfd62a..c94e924 100644 ---- a/MG5_aMC_v2_5_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc -+++ b/MG5_aMC_v2_5_2/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc +diff --git a/MG5_aMC_v2_5_3/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc b/MG5_aMC_v2_5_3/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc +index 3cfd62a..d43475c 100644 +--- a/MG5_aMC_v2_5_3/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc ++++ b/MG5_aMC_v2_5_3/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 # This is an example of how to run MadLoop from Python using the f2py compilation of the wrapper file 'f2py_wrapper.f'. -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/Cards.py b/MG5_aMC_v2_5_2/madgraph/madweight/Cards.py -index 1c949db..70605e4 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/Cards.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/Cards.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/Cards.py b/MG5_aMC_v2_5_3/madgraph/madweight/Cards.py +index 1c949db..202d025 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/Cards.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/Cards.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/MW_driver.py b/MG5_aMC_v2_5_2/madgraph/madweight/MW_driver.py -index 0796670..664347d 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/MW_driver.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/MW_driver.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/MW_driver.py b/MG5_aMC_v2_5_3/madgraph/madweight/MW_driver.py +index 0796670..3b66b16 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/MW_driver.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/MW_driver.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # Copyright (c) 2012 The MadGraph Development team and Contributors # -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/MW_info.py b/MG5_aMC_v2_5_2/madgraph/madweight/MW_info.py -index acaa43d..20592e6 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/MW_info.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/MW_info.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/MW_info.py b/MG5_aMC_v2_5_3/madgraph/madweight/MW_info.py +index acaa43d..b9daf7d 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/MW_info.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/MW_info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/blob_solution.py b/MG5_aMC_v2_5_2/madgraph/madweight/blob_solution.py -index 571b420..660d778 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/blob_solution.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/blob_solution.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/blob_solution.py b/MG5_aMC_v2_5_3/madgraph/madweight/blob_solution.py +index 571b420..632f01c 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/blob_solution.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/blob_solution.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 try: import madgraph.madweight.particle_class as particle_class -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/change_tf.py b/MG5_aMC_v2_5_2/madgraph/madweight/change_tf.py -index 4717715..f1b6e7c 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/change_tf.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/change_tf.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/change_tf.py b/MG5_aMC_v2_5_3/madgraph/madweight/change_tf.py +index 4717715..e06089f 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/change_tf.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/change_tf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 #Extension -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/create_param.py b/MG5_aMC_v2_5_2/madgraph/madweight/create_param.py -index f8fbb43..b80a490 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/create_param.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/create_param.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/create_param.py b/MG5_aMC_v2_5_3/madgraph/madweight/create_param.py +index f8fbb43..079a1f7 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/create_param.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/create_param.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/create_run.py b/MG5_aMC_v2_5_2/madgraph/madweight/create_run.py -index 2fa5a6d..49b76ef 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/create_run.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/create_run.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/create_run.py b/MG5_aMC_v2_5_3/madgraph/madweight/create_run.py +index 2fa5a6d..401d06c 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/create_run.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/create_run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 #Extension import string,os,sys,re,popen2,time,stat,filecmp -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/diagram_class.py b/MG5_aMC_v2_5_2/madgraph/madweight/diagram_class.py -index 1e35e71..96a45b1 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/diagram_class.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/diagram_class.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/diagram_class.py b/MG5_aMC_v2_5_3/madgraph/madweight/diagram_class.py +index 1e35e71..4ec27b6 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/diagram_class.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/diagram_class.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 import sys import logging -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/mod_file.py b/MG5_aMC_v2_5_2/madgraph/madweight/mod_file.py -index 5b3242f..4fb0a0c 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/mod_file.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/mod_file.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/mod_file.py b/MG5_aMC_v2_5_3/madgraph/madweight/mod_file.py +index 5b3242f..e512f94 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/mod_file.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/mod_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 #################################################################################################### #################################################################################################### ## ## -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/substructure_class.py b/MG5_aMC_v2_5_2/madgraph/madweight/substructure_class.py -index 370ee1f..3affadf 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/substructure_class.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/substructure_class.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/substructure_class.py b/MG5_aMC_v2_5_3/madgraph/madweight/substructure_class.py +index 370ee1f..d7fce2f 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/substructure_class.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/substructure_class.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 try: -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/verif_event.py b/MG5_aMC_v2_5_2/madgraph/madweight/verif_event.py -index 0882a96..224d17a 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/verif_event.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/verif_event.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/verif_event.py b/MG5_aMC_v2_5_3/madgraph/madweight/verif_event.py +index 0882a96..56d6a22 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/verif_event.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/verif_event.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_2/madgraph/madweight/write_MadWeight.py b/MG5_aMC_v2_5_2/madgraph/madweight/write_MadWeight.py -index 9596b17..10f2feb 100755 ---- a/MG5_aMC_v2_5_2/madgraph/madweight/write_MadWeight.py -+++ b/MG5_aMC_v2_5_2/madgraph/madweight/write_MadWeight.py +diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/write_MadWeight.py b/MG5_aMC_v2_5_3/madgraph/madweight/write_MadWeight.py +index 9596b17..6308845 100755 +--- a/MG5_aMC_v2_5_3/madgraph/madweight/write_MadWeight.py ++++ b/MG5_aMC_v2_5_3/madgraph/madweight/write_MadWeight.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ##### -*- coding: cp1252 -*- #Extension -diff --git a/MG5_aMC_v2_5_2/madgraph/various/combine_plots.py b/MG5_aMC_v2_5_2/madgraph/various/combine_plots.py -index 34311e4..0e0ad7d 100755 ---- a/MG5_aMC_v2_5_2/madgraph/various/combine_plots.py -+++ b/MG5_aMC_v2_5_2/madgraph/various/combine_plots.py +diff --git a/MG5_aMC_v2_5_3/madgraph/various/combine_plots.py b/MG5_aMC_v2_5_3/madgraph/various/combine_plots.py +index 34311e4..b768d06 100755 +--- a/MG5_aMC_v2_5_3/madgraph/various/combine_plots.py ++++ b/MG5_aMC_v2_5_3/madgraph/various/combine_plots.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python
-+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################
#
# Copyright (c) 2013 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_5_2/madgraph/various/histograms.py b/MG5_aMC_v2_5_2/madgraph/various/histograms.py -index ff61dd1..3e5748b 100755 ---- a/MG5_aMC_v2_5_2/madgraph/various/histograms.py -+++ b/MG5_aMC_v2_5_2/madgraph/various/histograms.py +diff --git a/MG5_aMC_v2_5_3/madgraph/various/histograms.py b/MG5_aMC_v2_5_3/madgraph/various/histograms.py +index adba88e..1698c30 100755 +--- a/MG5_aMC_v2_5_3/madgraph/various/histograms.py ++++ b/MG5_aMC_v2_5_3/madgraph/various/histograms.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/madgraph/various/plot_djrs.py b/MG5_aMC_v2_5_2/madgraph/various/plot_djrs.py -index c0fb743..30fcfbc 100644 ---- a/MG5_aMC_v2_5_2/madgraph/various/plot_djrs.py -+++ b/MG5_aMC_v2_5_2/madgraph/various/plot_djrs.py +diff --git a/MG5_aMC_v2_5_3/madgraph/various/plot_djrs.py b/MG5_aMC_v2_5_3/madgraph/various/plot_djrs.py +index c0fb743..f001d37 100644 +--- a/MG5_aMC_v2_5_3/madgraph/various/plot_djrs.py ++++ b/MG5_aMC_v2_5_3/madgraph/various/plot_djrs.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/madgraph/various/progressbar.py b/MG5_aMC_v2_5_2/madgraph/various/progressbar.py -index 2f1bc4d..eaeae7d 100755 ---- a/MG5_aMC_v2_5_2/madgraph/various/progressbar.py -+++ b/MG5_aMC_v2_5_2/madgraph/various/progressbar.py +diff --git a/MG5_aMC_v2_5_3/madgraph/various/progressbar.py b/MG5_aMC_v2_5_3/madgraph/various/progressbar.py +index 2f1bc4d..8e026de 100755 +--- a/MG5_aMC_v2_5_3/madgraph/various/progressbar.py ++++ b/MG5_aMC_v2_5_3/madgraph/various/progressbar.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 # -*- coding: iso-8859-1 -*- # # progressbar - Text progressbar library for python. -diff --git a/MG5_aMC_v2_5_2/tests/parallel_tests/loop_sample_script.py b/MG5_aMC_v2_5_2/tests/parallel_tests/loop_sample_script.py -index 1ee58f4..4fc64b5 100755 ---- a/MG5_aMC_v2_5_2/tests/parallel_tests/loop_sample_script.py -+++ b/MG5_aMC_v2_5_2/tests/parallel_tests/loop_sample_script.py +diff --git a/MG5_aMC_v2_5_3/tests/parallel_tests/loop_sample_script.py b/MG5_aMC_v2_5_3/tests/parallel_tests/loop_sample_script.py +index 1ee58f4..cb7936d 100755 +--- a/MG5_aMC_v2_5_3/tests/parallel_tests/loop_sample_script.py ++++ b/MG5_aMC_v2_5_3/tests/parallel_tests/loop_sample_script.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/tests/parallel_tests/sample_script.py b/MG5_aMC_v2_5_2/tests/parallel_tests/sample_script.py -index 2be23d9..ff11bf9 100755 ---- a/MG5_aMC_v2_5_2/tests/parallel_tests/sample_script.py -+++ b/MG5_aMC_v2_5_2/tests/parallel_tests/sample_script.py +diff --git a/MG5_aMC_v2_5_3/tests/parallel_tests/sample_script.py b/MG5_aMC_v2_5_3/tests/parallel_tests/sample_script.py +index 2be23d9..fa7cf67 100755 +--- a/MG5_aMC_v2_5_3/tests/parallel_tests/sample_script.py ++++ b/MG5_aMC_v2_5_3/tests/parallel_tests/sample_script.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/tests/test_manager.py b/MG5_aMC_v2_5_2/tests/test_manager.py -index 7b46b85..dc62fc1 100755 ---- a/MG5_aMC_v2_5_2/tests/test_manager.py -+++ b/MG5_aMC_v2_5_2/tests/test_manager.py +diff --git a/MG5_aMC_v2_5_3/tests/test_manager.py b/MG5_aMC_v2_5_3/tests/test_manager.py +index c996bd1..8f0b108 100755 +--- a/MG5_aMC_v2_5_3/tests/test_manager.py ++++ b/MG5_aMC_v2_5_3/tests/test_manager.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/create.py b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/create.py -index d14ce98..fb4fab2 100755 ---- a/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/create.py -+++ b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/create.py +diff --git a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/create.py b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/create.py +index 43290c5..557eaaf 100755 +--- a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/create.py ++++ b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/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_5_2/vendor/IREGI/src/oneloop/example_cpp/create.py b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/example_cpp/create.py -index fca7438..820cce8 100755 ---- a/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/example_cpp/create.py -+++ b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/example_cpp/create.py +diff --git a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/example_cpp/create.py b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/example_cpp/create.py +index fca7438..a911723 100755 +--- a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/example_cpp/create.py ++++ b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/example_cpp/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/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_5_2/vendor/IREGI/src/oneloop/src/avh_olo.py b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_olo.py -index 438f55a..c3fbcbb 100755 ---- a/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_olo.py -+++ b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_olo.py +diff --git a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_olo.py b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_olo.py +index 438f55a..6da43c3 100755 +--- a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_olo.py ++++ b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_olo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 import re,sys import avh_pc_olo -diff --git a/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py -index 150e4c0..f372e43 100755 ---- a/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py -+++ b/MG5_aMC_v2_5_2/vendor/IREGI/src/oneloop/src/avh_pc_exe.py +diff --git a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_pc_exe.py b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_pc_exe.py +index 150e4c0..13b9640 100755 +--- a/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_pc_exe.py ++++ b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_pc_exe.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/env python2 ++#!/usr/bin/python2 import sys import avh_pc |