diff options
author | JP-Ellis | 2017-04-03 18:57:27 +1000 |
---|---|---|
committer | JP-Ellis | 2017-04-03 18:57:27 +1000 |
commit | d9c4168d3aa41409c2f852fc41eec428a4b26e67 (patch) | |
tree | ca9fcd00231733361b79c96859daac131817752c | |
parent | 211c078911a1169836f0edbecf89c6359cc49d6e (diff) | |
download | aur-d9c4168d3aa41409c2f852fc41eec428a4b26e67.tar.gz |
Update to 2.5.4.
Signed-off-by: JP-Ellis <josh@jpellis.me>
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | mg5_configuration.patch | 6 | ||||
-rw-r--r-- | python2.patch | 324 |
4 files changed, 175 insertions, 175 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Mar 17 06:07:40 UTC 2017 +# Mon Apr 3 08:57:21 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.3 + pkgver = 2.5.4 pkgrel = 1 url = http://madgraph.hep.uiuc.edu/ arch = i686 @@ -22,12 +22,12 @@ pkgbase = madgraph optdepends = madgraph-pythia-pgs optdepends = madgraph-pythia8-interface options = !strip - source = https://launchpad.net/mg5amcnlo/2.0/2.5.x/+download/MG5_aMC_v2.5.3.tar.gz + source = https://launchpad.net/mg5amcnlo/2.0/2.5.x/+download/MG5_aMC_v2.5.4.tar.gz source = python2.patch source = mg5_configuration.patch - sha256sums = 8124ce6152fea32082ce76bc8afe6b618d3d022aa35a566864efdd37a81061c8 - sha256sums = 0b8e1a73b811a15ac2b06d65502f19e7fc64b6a24abd8c2f35474d3443ced2bb - sha256sums = 492329cc4158414c0b9e27d9b053afa04fe3afa2436a0c0b7aa014cafda2429f + sha256sums = cf690d228cfe054491d672c2ac9a835e9061c3494e196d4b0b5b7d16bc809236 + sha256sums = 18ea6bc5d0655067a03afbdeb33272b6ce8f11508b838124532e022893882c73 + sha256sums = ae4860ea65302b917ed8c6b357d0b54999d8ead3e698e907f9093733f3d2e8aa pkgname = madgraph @@ -1,7 +1,7 @@ # Maintainer: JP-Ellis <josh@jpellis.me> pkgname=madgraph -pkgver=2.5.3 +pkgver=2.5.4 _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" @@ -28,9 +28,9 @@ optdepends=( source=("https://launchpad.net/mg5amcnlo/${pkgver%%.*}.0/${pkgver%.*}.x/+download/MG5_aMC_v${pkgver}.tar.gz" "python2.patch" "mg5_configuration.patch") -sha256sums=('8124ce6152fea32082ce76bc8afe6b618d3d022aa35a566864efdd37a81061c8' - '0b8e1a73b811a15ac2b06d65502f19e7fc64b6a24abd8c2f35474d3443ced2bb' - '492329cc4158414c0b9e27d9b053afa04fe3afa2436a0c0b7aa014cafda2429f') +sha256sums=('cf690d228cfe054491d672c2ac9a835e9061c3494e196d4b0b5b7d16bc809236' + '18ea6bc5d0655067a03afbdeb33272b6ce8f11508b838124532e022893882c73' + 'ae4860ea65302b917ed8c6b357d0b54999d8ead3e698e907f9093733f3d2e8aa') options=("!strip") prepare() { diff --git a/mg5_configuration.patch b/mg5_configuration.patch index 7180947826a1..191cc7c1f73a 100644 --- a/mg5_configuration.patch +++ b/mg5_configuration.patch @@ -1,7 +1,7 @@ -diff --git a/MG5_aMC_v2_5_3/input/mg5_configuration.txt b/MG5_aMC_v2_5_3.patched/input/mg5_configuration.txt +diff --git a/MG5_aMC_v2_5_4/input/mg5_configuration.txt b/MG5_aMC_v2_5_4.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 +--- a/MG5_aMC_v2_5_4/input/mg5_configuration.txt ++++ b/MG5_aMC_v2_5_4.patched/input/mg5_configuration.txt @@ -45,11 +45,11 @@ #! Prefered WebBrower diff --git a/python2.patch b/python2.patch index 7fcd2a9b169a..1eb3fffbaa56 100644 --- a/python2.patch +++ b/python2.patch @@ -1,537 +1,537 @@ -diff --git a/MG5_aMC_v2_5_3/MadSpin/decay.py b/MG5_aMC_v2_5_3/MadSpin/decay.py +diff --git a/MG5_aMC_v2_5_4/MadSpin/decay.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/MadSpin/decay.py ++++ b/MG5_aMC_v2_5_4/MadSpin/decay.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 from __future__ import division -diff --git a/MG5_aMC_v2_5_3/MadSpin/madspin b/MG5_aMC_v2_5_3/MadSpin/madspin +diff --git a/MG5_aMC_v2_5_4/MadSpin/madspin b/MG5_aMC_v2_5_4/MadSpin/madspin index 7e36857..7d21992 100755 ---- a/MG5_aMC_v2_5_3/MadSpin/madspin -+++ b/MG5_aMC_v2_5_3/MadSpin/madspin +--- a/MG5_aMC_v2_5_4/MadSpin/madspin ++++ b/MG5_aMC_v2_5_4/MadSpin/madspin @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_3/Template/LO/bin/generate_events b/MG5_aMC_v2_5_3/Template/LO/bin/generate_events +diff --git a/MG5_aMC_v2_5_4/Template/LO/bin/generate_events b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/LO/bin/generate_events ++++ b/MG5_aMC_v2_5_4/Template/LO/bin/generate_events @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -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 +diff --git a/MG5_aMC_v2_5_4/Template/LO/bin/internal/Gridpack/gridrun b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/LO/bin/internal/Gridpack/gridrun ++++ b/MG5_aMC_v2_5_4/Template/LO/bin/internal/Gridpack/gridrun @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -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 +diff --git a/MG5_aMC_v2_5_4/Template/LO/bin/internal/addmasses_optional.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/LO/bin/internal/addmasses_optional.py ++++ b/MG5_aMC_v2_5_4/Template/LO/bin/internal/addmasses_optional.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # # doubleswitch.py # Author: Stephen Mrenna -diff --git a/MG5_aMC_v2_5_3/Template/LO/bin/madevent b/MG5_aMC_v2_5_3/Template/LO/bin/madevent +diff --git a/MG5_aMC_v2_5_4/Template/LO/bin/madevent b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/LO/bin/madevent ++++ b/MG5_aMC_v2_5_4/Template/LO/bin/madevent @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/Info.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/Info.py +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/Info.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/Info.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/Info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python
+#!/usr/bin/python2 def giveInfo(class_):
if type(class_)!=str:
-diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/clean.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/clean.py +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/clean.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/clean.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/clean.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -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 +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/expand_MadWeight.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/expand_MadWeight.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/expand_MadWeight.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # Module import string -diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/madweight.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/madweight.py +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/madweight.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/madweight.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/madweight.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # idea have 2 script # madweight.py -> direct submission -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 +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/put_banner.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/put_banner.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/put_banner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MG/ME/MW ## -diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/splitbanner.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/splitbanner.py +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/splitbanner.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/splitbanner.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/splitbanner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/Python/tests.py b/MG5_aMC_v2_5_3/Template/MadWeight/Python/tests.py +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/Python/tests.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/Python/tests.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/Python/tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 #################################################################################################### #################################################################################################### ## ## -diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/bin/madweight.py b/MG5_aMC_v2_5_3/Template/MadWeight/bin/madweight.py +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/bin/madweight.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/bin/madweight.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/bin/madweight.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph Development team and Contributors -diff --git a/MG5_aMC_v2_5_3/Template/MadWeight/bin/mw_options b/MG5_aMC_v2_5_3/Template/MadWeight/bin/mw_options +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/bin/mw_options b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/bin/mw_options ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/bin/mw_options @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -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 +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/mod_file/check_model.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/mod_file/check_model.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/mod_file/check_model.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 #test -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 +diff --git a/MG5_aMC_v2_5_4/Template/MadWeight/mod_file/mod_file.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/MadWeight/mod_file/mod_file.py ++++ b/MG5_aMC_v2_5_4/Template/MadWeight/mod_file/mod_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 #Extension import string -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 +diff --git a/MG5_aMC_v2_5_4/Template/NLO/Utilities/NLO_Born3.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/Utilities/NLO_Born3.py ++++ b/MG5_aMC_v2_5_4/Template/NLO/Utilities/NLO_Born3.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 inp = open('./MADatNLO.top', 'r') out = open('./MADatNLO_combined.top', 'w') -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 +diff --git a/MG5_aMC_v2_5_4/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py ++++ b/MG5_aMC_v2_5_4/Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -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 +diff --git a/MG5_aMC_v2_5_4/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py ++++ b/MG5_aMC_v2_5_4/Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/aMCatNLO b/MG5_aMC_v2_5_3/Template/NLO/bin/aMCatNLO +diff --git a/MG5_aMC_v2_5_4/Template/NLO/bin/aMCatNLO b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/bin/aMCatNLO ++++ b/MG5_aMC_v2_5_4/Template/NLO/bin/aMCatNLO @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/calculate_xsect b/MG5_aMC_v2_5_3/Template/NLO/bin/calculate_xsect +diff --git a/MG5_aMC_v2_5_4/Template/NLO/bin/calculate_xsect b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/bin/calculate_xsect ++++ b/MG5_aMC_v2_5_4/Template/NLO/bin/calculate_xsect @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/generate_events b/MG5_aMC_v2_5_3/Template/NLO/bin/generate_events +diff --git a/MG5_aMC_v2_5_4/Template/NLO/bin/generate_events b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/bin/generate_events ++++ b/MG5_aMC_v2_5_4/Template/NLO/bin/generate_events @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -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 +diff --git a/MG5_aMC_v2_5_4/Template/NLO/bin/internal/split_jobs.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/bin/internal/split_jobs.py ++++ b/MG5_aMC_v2_5_4/Template/NLO/bin/internal/split_jobs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 # MZ, 2012-06-14 import os import sys -diff --git a/MG5_aMC_v2_5_3/Template/NLO/bin/shower b/MG5_aMC_v2_5_3/Template/NLO/bin/shower +diff --git a/MG5_aMC_v2_5_4/Template/NLO/bin/shower b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/Template/NLO/bin/shower ++++ b/MG5_aMC_v2_5_4/Template/NLO/bin/shower @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2011 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_3/aloha/bin/aloha b/MG5_aMC_v2_5_3/aloha/bin/aloha +diff --git a/MG5_aMC_v2_5_4/aloha/bin/aloha b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/aloha/bin/aloha ++++ b/MG5_aMC_v2_5_4/aloha/bin/aloha @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 import sys -diff --git a/MG5_aMC_v2_5_3/bin/.compile.py b/MG5_aMC_v2_5_3/bin/.compile.py +diff --git a/MG5_aMC_v2_5_4/bin/.compile.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/bin/.compile.py ++++ b/MG5_aMC_v2_5_4/bin/.compile.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # 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 +diff --git a/MG5_aMC_v2_5_4/bin/mg5 b/MG5_aMC_v2_5_4/bin/mg5 index f31c620..33e13e9 100755 ---- a/MG5_aMC_v2_5_3/bin/mg5 -+++ b/MG5_aMC_v2_5_3/bin/mg5 +--- a/MG5_aMC_v2_5_4/bin/mg5 ++++ b/MG5_aMC_v2_5_4/bin/mg5 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # -diff --git a/MG5_aMC_v2_5_3/bin/mg5_aMC b/MG5_aMC_v2_5_3/bin/mg5_aMC +diff --git a/MG5_aMC_v2_5_4/bin/mg5_aMC b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/bin/mg5_aMC ++++ b/MG5_aMC_v2_5_4/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 +diff --git a/MG5_aMC_v2_5_4/madgraph/iolibs/gen_infohtml.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/iolibs/gen_infohtml.py ++++ b/MG5_aMC_v2_5_4/madgraph/iolibs/gen_infohtml.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -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 +diff --git a/MG5_aMC_v2_5_4/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc ++++ b/MG5_aMC_v2_5_4/madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/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_3/madgraph/madweight/Cards.py b/MG5_aMC_v2_5_3/madgraph/madweight/Cards.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/Cards.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/Cards.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/Cards.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/MW_driver.py b/MG5_aMC_v2_5_3/madgraph/madweight/MW_driver.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/MW_driver.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/MW_driver.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/MW_driver.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # Copyright (c) 2012 The MadGraph Development team and Contributors # -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/MW_info.py b/MG5_aMC_v2_5_3/madgraph/madweight/MW_info.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/MW_info.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/MW_info.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/MW_info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/blob_solution.py b/MG5_aMC_v2_5_3/madgraph/madweight/blob_solution.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/blob_solution.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/blob_solution.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/blob_solution.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 try: import madgraph.madweight.particle_class as particle_class -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/change_tf.py b/MG5_aMC_v2_5_3/madgraph/madweight/change_tf.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/change_tf.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/change_tf.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/change_tf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 #Extension -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/create_param.py b/MG5_aMC_v2_5_3/madgraph/madweight/create_param.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/create_param.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/create_param.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/create_param.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/create_run.py b/MG5_aMC_v2_5_3/madgraph/madweight/create_run.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/create_run.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/create_run.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/create_run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 #Extension import string,os,sys,re,popen2,time,stat,filecmp -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/diagram_class.py b/MG5_aMC_v2_5_3/madgraph/madweight/diagram_class.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/diagram_class.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/diagram_class.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/diagram_class.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 import sys import logging -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/mod_file.py b/MG5_aMC_v2_5_3/madgraph/madweight/mod_file.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/mod_file.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/mod_file.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/mod_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 #################################################################################################### #################################################################################################### ## ## -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/substructure_class.py b/MG5_aMC_v2_5_3/madgraph/madweight/substructure_class.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/substructure_class.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/substructure_class.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/substructure_class.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 try: -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/verif_event.py b/MG5_aMC_v2_5_3/madgraph/madweight/verif_event.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/verif_event.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/verif_event.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/verif_event.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ########################################################################## ## ## ## MadWeight ## -diff --git a/MG5_aMC_v2_5_3/madgraph/madweight/write_MadWeight.py b/MG5_aMC_v2_5_3/madgraph/madweight/write_MadWeight.py +diff --git a/MG5_aMC_v2_5_4/madgraph/madweight/write_MadWeight.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/madweight/write_MadWeight.py ++++ b/MG5_aMC_v2_5_4/madgraph/madweight/write_MadWeight.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ##### -*- coding: cp1252 -*- #Extension -diff --git a/MG5_aMC_v2_5_3/madgraph/various/combine_plots.py b/MG5_aMC_v2_5_3/madgraph/various/combine_plots.py +diff --git a/MG5_aMC_v2_5_4/madgraph/various/combine_plots.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/various/combine_plots.py ++++ b/MG5_aMC_v2_5_4/madgraph/various/combine_plots.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python
+#!/usr/bin/python2 ################################################################################
#
# Copyright (c) 2013 The MadGraph5_aMC@NLO Development team and Contributors
-diff --git a/MG5_aMC_v2_5_3/madgraph/various/histograms.py b/MG5_aMC_v2_5_3/madgraph/various/histograms.py +diff --git a/MG5_aMC_v2_5_4/madgraph/various/histograms.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/various/histograms.py ++++ b/MG5_aMC_v2_5_4/madgraph/various/histograms.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_3/madgraph/various/plot_djrs.py b/MG5_aMC_v2_5_3/madgraph/various/plot_djrs.py +diff --git a/MG5_aMC_v2_5_4/madgraph/various/plot_djrs.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/various/plot_djrs.py ++++ b/MG5_aMC_v2_5_4/madgraph/various/plot_djrs.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2010 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_3/madgraph/various/progressbar.py b/MG5_aMC_v2_5_3/madgraph/various/progressbar.py +diff --git a/MG5_aMC_v2_5_4/madgraph/various/progressbar.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/madgraph/various/progressbar.py ++++ b/MG5_aMC_v2_5_4/madgraph/various/progressbar.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: iso-8859-1 -*- # # progressbar - Text progressbar library for python. -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 +diff --git a/MG5_aMC_v2_5_4/tests/parallel_tests/loop_sample_script.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/tests/parallel_tests/loop_sample_script.py ++++ b/MG5_aMC_v2_5_4/tests/parallel_tests/loop_sample_script.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -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 +diff --git a/MG5_aMC_v2_5_4/tests/parallel_tests/sample_script.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/tests/parallel_tests/sample_script.py ++++ b/MG5_aMC_v2_5_4/tests/parallel_tests/sample_script.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -diff --git a/MG5_aMC_v2_5_3/tests/test_manager.py b/MG5_aMC_v2_5_3/tests/test_manager.py +diff --git a/MG5_aMC_v2_5_4/tests/test_manager.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/tests/test_manager.py ++++ b/MG5_aMC_v2_5_4/tests/test_manager.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 ################################################################################ # # Copyright (c) 2009 The MadGraph5_aMC@NLO Development team and Contributors -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 +diff --git a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/create.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/create.py ++++ b/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/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_3/vendor/IREGI/src/oneloop/example_cpp/create.py b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/example_cpp/create.py +diff --git a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/example_cpp/create.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/example_cpp/create.py ++++ b/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/example_cpp/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/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_3/vendor/IREGI/src/oneloop/src/avh_olo.py b/MG5_aMC_v2_5_3/vendor/IREGI/src/oneloop/src/avh_olo.py +diff --git a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/src/avh_olo.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/src/avh_olo.py ++++ b/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/src/avh_olo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 import re,sys import avh_pc_olo -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 +diff --git a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/src/avh_pc_exe.py b/MG5_aMC_v2_5_4/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 +--- a/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/src/avh_pc_exe.py ++++ b/MG5_aMC_v2_5_4/vendor/IREGI/src/oneloop/src/avh_pc_exe.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 |