lp:~maddevelopers/mg5amcnlo/1.5.13

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~maddevelopers/mg5amcnlo/2.0.0beta4

Olivier Mattelaer: Disapprove on 2013-10-22

Diff: 27163 lines (+10077/-7186) (has conflicts)

53 files modified

Template/Common/bin/internal/run_pythia (+1/-1)
Template/LO/SubProcesses/cuts.f (+3/-1)
Template/LO/bin/internal/clean_template (+6/-0)
UpdateNotes.txt (+22/-0)
aloha/__init__.py (+2/-0)
aloha/aloha_lib.py (+9/-1)
aloha/create_aloha.py (+1/-1)
input/.mg5_configuration_default.txt (+85/-13)
madgraph/VERSION (+5/-0)
madgraph/__init__.py (+8/-1)
madgraph/core/diagram_generation.py (+1/-1)
madgraph/interface/extended_cmd.py (+19/-1)
madgraph/interface/launch_ext_program.py (+11/-0)
madgraph/interface/madevent_interface.py (+901/-4)
madgraph/interface/madgraph_interface.py (+44/-2)
madgraph/iolibs/export_v4.py (+56/-11)
madgraph/iolibs/import_v4.py (+19/-5)
madgraph/iolibs/template_files/addmothers.f (+5/-2)
madgraph/iolibs/template_files/madevent_driver.f (+3/-1)
madgraph/various/cluster.py (+168/-24)
madgraph/various/misc.py (+1/-1)
models/EWdim6/EWdim6.log (+16/-9)
models/EWdim6/__init__.py (+18/-13)
models/EWdim6/build_restrict.py (+25/-10)
models/EWdim6/coupling_orders.py (+11/-3)
models/EWdim6/couplings.py (+299/-247)
models/EWdim6/function_library.py (+9/-0)
models/EWdim6/lorentz.py (+63/-67)
models/EWdim6/object_library.py (+118/-12)
models/EWdim6/parameters.py (+156/-54)
models/EWdim6/particles.py (+238/-198)
models/EWdim6/propagators.py (+35/-0)
models/EWdim6/restrict_default.dat (+90/-0)
models/EWdim6/vertices.py (+333/-303)
models/EWdim6/write_param_card.py (+3/-2)
models/__init__.py (+10/-1)
models/check_param_card.py (+16/-9)
models/import_ufo.py (+6/-1)
models/nmssm/__init__.py (+18/-2)
models/nmssm/coupling_orders.py (+3/-3)
models/nmssm/couplings.py (+1657/-1565)
models/nmssm/function_library.py (+9/-1)
models/nmssm/lorentz.py (+21/-6)
models/nmssm/object_library.py (+130/-12)
models/nmssm/parameters.py (+1125/-1125)
models/nmssm/particles.py (+7/-5)
models/nmssm/vertices.py (+4223/-3413)
models/nmssm/write_param_card.py (+4/-3)
models/write_param_card.py (+20/-9)
tests/acceptance_tests/test_cmd.py (+14/-14)
tests/input_files/test_mssm_generation (+1/-0)
tests/unit_tests/iolibs/test_export_v4.py (+23/-23)
tests/unit_tests/various/test_check_param_card.py (+6/-6)

api

Merged into lp:~madteam/mg5amcnlo/trunk at revision 246

Olivier Mattelaer: Needs Fixing on 2013-10-25

Valentin Hirschi: Approve on 2013-10-24

Rikkert Frederix: Approve on 2013-10-24

marco zaro: Pending requested 2013-10-14

Diff: 26272 lines (+9139/-7284)

53 files modified

Template/SubProcesses/cuts.f (+3/-1)
Template/bin/internal/clean_template (+6/-0)
Template/bin/internal/run_pythia (+1/-1)
UpdateNotes.txt (+18/-0)
aloha/__init__.py (+2/-0)
aloha/aloha_lib.py (+9/-1)
aloha/create_aloha.py (+1/-1)
input/.mg5_configuration_default.txt (+79/-88)
madgraph/VERSION (+2/-2)
madgraph/__init__.py (+8/-1)
madgraph/core/diagram_generation.py (+1/-1)
madgraph/interface/extended_cmd.py (+19/-1)
madgraph/interface/launch_ext_program.py (+8/-1)
madgraph/interface/madevent_interface.py (+33/-12)
madgraph/interface/madgraph_interface.py (+24/-7)
madgraph/iolibs/export_v4.py (+43/-14)
madgraph/iolibs/import_v4.py (+19/-5)
madgraph/iolibs/template_files/addmothers.f (+5/-2)
madgraph/iolibs/template_files/madevent_driver.f (+3/-1)
madgraph/various/cluster.py (+151/-27)
madgraph/various/misc.py (+1/-1)
models/EWdim6/EWdim6.log (+16/-9)
models/EWdim6/__init__.py (+18/-13)
models/EWdim6/build_restrict.py (+25/-10)
models/EWdim6/coupling_orders.py (+11/-3)
models/EWdim6/couplings.py (+299/-247)
models/EWdim6/function_library.py (+9/-0)
models/EWdim6/lorentz.py (+63/-67)
models/EWdim6/object_library.py (+118/-12)
models/EWdim6/parameters.py (+156/-54)
models/EWdim6/particles.py (+238/-198)
models/EWdim6/propagators.py (+35/-0)
models/EWdim6/restrict_default.dat (+90/-0)
models/EWdim6/vertices.py (+333/-303)
models/EWdim6/write_param_card.py (+3/-2)
models/__init__.py (+10/-1)
models/check_param_card.py (+16/-9)
models/import_ufo.py (+2/-2)
models/nmssm/__init__.py (+18/-2)
models/nmssm/coupling_orders.py (+3/-3)
models/nmssm/couplings.py (+1657/-1565)
models/nmssm/function_library.py (+9/-1)
models/nmssm/lorentz.py (+21/-6)
models/nmssm/object_library.py (+130/-12)
models/nmssm/parameters.py (+1125/-1125)
models/nmssm/particles.py (+7/-5)
models/nmssm/vertices.py (+4223/-3413)
models/nmssm/write_param_card.py (+4/-3)
models/write_param_card.py (+20/-9)
tests/acceptance_tests/test_cmd.py (+14/-14)
tests/input_files/test_mssm_generation (+1/-0)
tests/unit_tests/iolibs/test_export_v4.py (+23/-23)
tests/unit_tests/various/test_check_param_card.py (+6/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1208520: failed to reduce to color indices	Low	Fix Released
Bug #1210017: Failing in LSF after finishing all jobs	Undecided	Fix Released
Bug #1219409: "output -f" with error: OSError : [Errno 13] Permission denied	Undecided	Fix Released
Bug #1219758: IOError : [Errno 2] No such file or directory	Undecided	Fix Released
Bug #1232663: website down	Undecided	Fix Released
Bug #1243189: unhelpful error message on importing v4 model with same name as existing process directory	Undecided	Fix Released

Link a bug report

Related blueprints

265. By Olivier Mattelaer on 2013-11-01

- improve cluster resubmition
- correct complex mass scheme
- fix a problem with the options pass to madevent

264. By Olivier Mattelaer on 2013-10-25

slightly change the resubmission procedure to avoid the inline waiting time.
This is now just a printout and the waiting time is done without any stopping the
control of the program.
The waiting time is also an input parameter.

263. By Olivier Mattelaer on 2013-10-25

remove the printout for maxweight

262. By Olivier Mattelaer on 2013-10-22

fix bug #1243189 (problem with path finding for v4 model)

261. By Olivier Mattelaer on 2013-10-22

Fix a bug when the hierarchy of QCD is not at one. (Thanks C. Degrande)

260. By Olivier Mattelaer on 2013-10-22

add propagators.py to EWdim6

259. By Olivier Mattelaer on 2013-10-21

Udpate the EWdim6 according to the snowmass paper

258. By Olivier Mattelaer on 2013-10-15

fix the points remaining in my auto-review (but the Dim6 stuff which waits for Celine model)

257. By Olivier Mattelaer on 2013-10-15

First part of the auto-review

256. By Olivier Mattelaer on 2013-10-15

add a security for vbf cut when only one jet is present in the final state