lp:~madnklo/mg5amcnlo/MadNkLO_ISR

Branch merges

Ready for review for merging into lp:~madnklo/mg5amcnlo/MadNkLO

Nicolas Deutschmann: Pending requested 2018-08-09

Simone Lionetti: Pending requested 2018-08-09

Diff: 18124 lines (+11979/-1788) (has conflicts)

43 files modified

Template/ME7/Cards/run_card.dat (+2/-0)
madgraph/core/accessors.py (+56/-28)
madgraph/core/base_objects.py (+257/-16)
madgraph/core/contributions.py (+918/-342)
madgraph/core/subtraction.py (+865/-136)
madgraph/integrator/ME7_integrands.py (+2356/-651)
madgraph/integrator/cuba_interface.py (+432/-0)
madgraph/integrator/mappings.py (+266/-31)
madgraph/integrator/phase_space_generators.py (+133/-12)
madgraph/integrator/phase_space_generators.pyx (+2/-2)
madgraph/integrator/pyCubaIntegrator.py (+444/-91)
madgraph/integrator/vectors.py (+75/-4)
madgraph/integrator/vegas3_integrator.py (+18/-16)
madgraph/integrator/walkers.py (+43/-22)
madgraph/interface/ME7_interface.py (+296/-128)
madgraph/interface/loop_interface.py (+23/-10)
madgraph/interface/madgraph_interface.py (+479/-152)
madgraph/iolibs/export_ME7.py (+331/-29)
madgraph/iolibs/template_files/loop_optimized/loop_matrix_standalone.inc (+3/-3)
madgraph/iolibs/template_files/loop_optimized/user_access_subroutines.inc (+81/-0)
madgraph/iolibs/template_files/subtraction/QCD_local_currents.py (+264/-18)
madgraph/iolibs/template_files/subtraction/cataniseymour/NLO/local_currents.py (+2/-2)
madgraph/iolibs/template_files/subtraction/colorful/NLO/beam_factorization.py (+619/-0)
madgraph/iolibs/template_files/subtraction/colorful/NLO/integrated_currents.py (+11/-21)
madgraph/iolibs/template_files/subtraction/colorful/NLO/local_currents.py (+27/-10)
madgraph/iolibs/template_files/subtraction/colorful_pp/NLO/beam_factorization.py (+630/-0)
madgraph/iolibs/template_files/subtraction/colorful_pp/NLO/ginacg.cpp (+22/-0)
madgraph/iolibs/template_files/subtraction/colorful_pp/NLO/ginacgcompile.sh (+3/-0)
madgraph/iolibs/template_files/subtraction/colorful_pp/NLO/hardcoded_integrated_currents.py (+195/-0)
madgraph/iolibs/template_files/subtraction/colorful_pp/NLO/integrated_currents.py (+768/-0)
madgraph/iolibs/template_files/subtraction/colorful_pp/NLO/local_currents.py (+907/-0)
madgraph/iolibs/template_files/subtraction/colorful_pp/NNLO/local_currents.py (+869/-0)
madgraph/iolibs/template_files/subtraction/subtraction_current_implementations_utils.py (+129/-33)
madgraph/loop/loop_diagram_generation.py (+11/-3)
madgraph/loop/loop_exporters.py (+8/-0)
madgraph/various/banner.py (+1/-0)
madgraph/various/misc.py (+21/-1)
tests/acceptance_tests/test_currents.py (+1/-1)
tests/parallel_tests/compare_ME7_with_ME6.py (+1/-1)
tests/time_db (+366/-16)
tests/unit_tests/core/test_contributions.py (+2/-0)
tests/unit_tests/integrator/test_mappings.py (+33/-0)
tests/unit_tests/integrator/test_phase_space_generators.py (+9/-9)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

595. By Simone Lionetti <email address hidden> on 2018-10-12

Commented out unused momenta from CataniSeymour currents that could cause fails

594. By Simone Lionetti <email address hidden> on 2018-10-12

Improved handling of flavor assignments and cut events in test_IR_limits

593. By Simone Lionetti <email address hidden> on 2018-10-11

Partially fixed counterterm handling in test_IR_limits

592. By Simone Lionetti <email address hidden> on 2018-10-11

Improved error message of get_parent

591. By Nicolas Deutschmann on 2018-10-11

ProcessKey now always sorts final states PDGs. The sort_PDGs options only applies to the initial state.

590. By Valentin Hirschi on 2018-10-07

1. Fixed issue with mapped processes having non-consecutive leg numbers.
2. Insure to completely skipped the beam factorization treatment when no contribution has an active beam.

589. By Valentin Hirschi on 2018-10-05

1. Fixed obvious mistake in the recursion setup for function get_reduced_flavor of the CountertermNode.

588. By Simone Lionetti <email address hidden> on 2018-10-05

Added safeguard for loading libcuba.so

587. By Nicolas Deutschmann on 2018-10-05

Bug correction: identifying colorful_pp as a scheme using BS contributions and correcting selection of initial-initial eikonals

586. By Nicolas Deutschmann on 2018-10-05

Added the possibility to have 1,2,3 quarks in protons.
A warning is displayed when using a single quark: debug only