lp:~maddevelopers/mg5amcnlo/1.4.7

Branch merges

Propose for merging

No branches dependent on this one.

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

Olivier Mattelaer: Approve on 2012-06-23

Johan Alwall (community): Approve on 2012-06-23

Diff: 28673 lines (+9776/-10747)

45 files modified

Template/Source/gen_ximprove.f (+10/-8)
Template/Source/ranmar.f (+35/-5)
Template/Source/rw_routines.f (+41/-0)
Template/Source/setrun.f (+3/-3)
Template/SubProcesses/addmothers.f (+13/-7)
Template/SubProcesses/cluster.f (+4/-4)
Template/SubProcesses/myamp.f (+43/-43)
Template/bin/internal/Gridpack/compile (+9/-1)
Template/bin/internal/make_gridpack (+18/-0)
Template/bin/internal/make_madevent_tar (+7/-0)
Template/bin/internal/merge.pl (+2/-2)
Template/makefile (+0/-27)
UpdateNotes.txt (+43/-11)
madgraph/VERSION (+2/-2)
madgraph/core/base_objects.py (+16/-0)
madgraph/core/diagram_generation.py (+10/-2)
madgraph/core/helas_objects.py (+79/-11)
madgraph/interface/extended_cmd.py (+1/-1)
madgraph/interface/madevent_interface.py (+56/-30)
madgraph/interface/madgraph_interface.py (+7/-7)
madgraph/iolibs/export_v4.py (+4/-3)
madgraph/iolibs/group_subprocs.py (+23/-15)
madgraph/iolibs/template_files/madevent_combine_events.f (+2/-2)
madgraph/iolibs/template_files/madevent_symmetry.f (+23/-21)
madgraph/various/banner.py (+1/-1)
madgraph/various/cluster.py (+41/-30)
models/import_ufo.py (+1/-1)
models/nmssm/__init__.py (+3/-4)
models/nmssm/coupling_orders.py (+6/-5)
models/nmssm/couplings.py (+1488/-2192)
models/nmssm/lorentz.py (+3/-7)
models/nmssm/object_library.py (+14/-0)
models/nmssm/param_card.dat (+201/-200)
models/nmssm/parameters.py (+3591/-3687)
models/nmssm/particles.py (+174/-174)
models/nmssm/restrict_default.dat (+155/-402)
models/nmssm/vertices.py (+3165/-3711)
models/nmssm/write_param_card.py (+2/-2)
tests/acceptance_tests/test_cmd_madevent.py (+2/-3)
tests/unit_tests/core/test_base_objects.py (+23/-0)
tests/unit_tests/core/test_diagram_generation.py (+31/-2)
tests/unit_tests/core/test_helas_objects.py (+280/-5)
tests/unit_tests/iolibs/test_export_v4.py (+134/-110)
tests/unit_tests/iolibs/test_group_subprocs.py (+6/-3)
tests/unit_tests/various/test_diagram_symmetry.py (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1000357: LHEF writer fails for NPRUP>99	Low	Fix Released
Bug #1009830: error for the hidden Abelian Higgs model	Undecided	Fix Released
Bug #1012049: Anti-quarks overwrite quark SubProcess directory	Undecided	Fix Released
Bug #1015032: Event record shows Z decay to e+mu-, leptons attached to wrong boson?	Medium	Fix Released

Link a bug report

Related blueprints

243. By Johan Alwall on 2012-06-23

Fixed Oliviers final comment.

242. By Johan Alwall on 2012-06-23

Fixed problem with automatic finding of WEIGHTED orders for effective theories

241. By Johan Alwall on 2012-06-23

Fixed Oliviers point about duplicate processes (by replacing Found by Ignoring)

240. By Johan Alwall on 2012-06-23

Fixed the integer/integer*8 issue properly, fixed failing acceptance test due to changed random seed.

239. By mattelaer-olivier on 2012-06-22

merge with the emergency fix fo the trunk + apply corrections concerning point 1 of my review

238. By Johan Alwall on 2012-06-22

Fixed random seed above 60000 or so, which was broken since MG5 1.0. Thanks to Tim for implementing :-)

237. By Johan Alwall on 2012-06-20

Fixed bug #1015032, which turned out to be due to erraneous matrix element combination using the IdentifyMETag. This failed when processes had identical diagrams but different relative order of the particles in different diagrams. Also finally fixed the write for inputs in symmetry.f.

236. By omatt on 2012-06-19

update interactive help to replace the "draw" suggestions by display diagrams (Thanks to C. Degrande)

235. By Johan Alwall on 2012-06-19

Removed the stupid makefile in Template, and replaced it with two scripts to create the madevent.tar.gz and gridpack.tar.gz files. Fixed the bin/internal/Gridpack/compile file so also the SubProcesses directory is correctly cleaned.

234. By omatt on 2012-06-18

in mode auto avoid to remove any Cards present in the Cards directory