MadGraph5_aMC@NLO

Merge lp://staging/~maddevelopers/mg5amcnlo/3.4.0 into lp://staging/mg5amcnlo

  1. 3.4.0
  2. Merge into 3.x
Proposed by Olivier Mattelaer
Status: Merged
Merged at revision: 973
Proposed branch: lp://staging/~maddevelopers/mg5amcnlo/3.4.0
Merge into: lp://staging/mg5amcnlo
Diff against target: 42427 lines (+38214/-788)
156 files modified
MadSpin/decay.py (+14/-8)
MadSpin/interface_madspin.py (+31/-5)
Template/LO/Cards/pythia8_card_default.dat (+10/-8)
Template/LO/Cards/rivet_card_default.dat (+79/-0)
Template/LO/Cards/run_card.dat (+1/-0)
Template/LO/Source/run.inc (+8/-5)
Template/LO/SubProcesses/makefile (+8/-2)
Template/MadWeight/Python/Info.py (+1/-1)
Template/MadWeight/Python/clean.py (+1/-1)
Template/MadWeight/Python/expand_MadWeight.py (+1/-1)
Template/MadWeight/Python/madweight.py (+1/-1)
Template/MadWeight/Python/put_banner.py (+1/-1)
Template/MadWeight/Python/splitbanner.py (+1/-1)
Template/MadWeight/Python/tests.py (+1/-1)
Template/MadWeight/bin/madweight.py (+1/-1)
Template/MadWeight/bin/mw_options (+1/-1)
Template/MadWeight/mod_file/check_model.py (+1/-1)
Template/MadWeight/mod_file/mod_file.py (+1/-1)
Template/NLO/Cards/run_card.dat (+1/-0)
Template/NLO/Source/makefile (+12/-1)
Template/NLO/Source/run.inc (+3/-2)
Template/NLO/SubProcesses/makefile (+5/-0)
Template/NLO/SubProcesses/makefile_fks_dir (+8/-0)
Template/NLO/Utilities/NLO_Born3.py (+1/-1)
Template/NLO/Utilities/VetoPrefactors/resum_reweighter.py (+1/-1)
Template/NLO/Utilities/VetoPrefactors/virt_reweighter.py (+1/-1)
Template/NLO/bin/internal/split_jobs.py (+1/-1)
UpdateNotes.txt (+22/-3)
VERSION (+2/-3)
aloha/bin/aloha (+1/-1)
bin/compile.py (+3/-3)
bin/create_aloha_release.py (+1/-1)
bin/create_release.py (+16/-8)
bin/mg5_aMC (+7/-10)
madgraph/core/base_objects.py (+39/-1)
madgraph/interface/amcatnlo_interface.py (+1/-1)
madgraph/interface/amcatnlo_run_interface.py (+4/-2)
madgraph/interface/common_run_interface.py (+378/-59)
madgraph/interface/extended_cmd.py (+4/-4)
madgraph/interface/madevent_interface.py (+283/-40)
madgraph/interface/madgraph_interface.py (+54/-23)
madgraph/interface/reweight_interface.py (+116/-74)
madgraph/iolibs/export_fks.py (+32/-6)
madgraph/iolibs/export_v4.py (+693/-47)
madgraph/iolibs/gen_infohtml.py (+1/-1)
madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc (+1/-1)
madgraph/iolibs/template_files/madevent_makefile_source (+4/-1)
madgraph/iolibs/template_files/super_auto_dsig_group_v4.inc (+1/-1)
madgraph/loop/loop_base_objects.py (+1/-0)
madgraph/loop/loop_exporters.py (+1/-1)
madgraph/madevent/gen_crossxhtml.py (+24/-2)
madgraph/madevent/gen_ximprove.py (+3/-1)
madgraph/madweight/Cards.py (+1/-1)
madgraph/madweight/MW_driver.py (+1/-1)
madgraph/madweight/MW_info.py (+1/-1)
madgraph/madweight/blob_solution.py (+1/-1)
madgraph/madweight/change_tf.py (+1/-1)
madgraph/madweight/create_param.py (+1/-1)
madgraph/madweight/create_run.py (+1/-1)
madgraph/madweight/diagram_class.py (+1/-1)
madgraph/madweight/mod_file.py (+1/-1)
madgraph/madweight/substructure_class.py (+1/-1)
madgraph/madweight/verif_event.py (+1/-1)
madgraph/madweight/write_MadWeight.py (+1/-1)
madgraph/various/banner.py (+250/-15)
madgraph/various/combine_plots.py (+1/-1)
madgraph/various/histograms.py (+1/-1)
madgraph/various/lhe_parser.py (+138/-6)
madgraph/various/misc.py (+41/-22)
madgraph/various/plot_djrs.py (+1/-1)
models/__init__.py (+1/-1)
models/check_param_card.py (+66/-41)
models/import_ufo.py (+64/-6)
models/template_files/fortran/lha_read.f (+13/-0)
models/template_files/fortran/makefile_madevent (+9/-1)
models/template_files/fortran/makefile_standalone (+11/-0)
models/template_files/fortran/testprog.f (+56/-0)
models/usermod.py (+6/-0)
models/write_param_card.py (+6/-3)
tests/acceptance_tests/test_cmd.py (+3/-0)
tests/acceptance_tests/test_cmd_amcatnlo.py (+62/-3)
tests/acceptance_tests/test_cmd_madevent.py (+142/-6)
tests/acceptance_tests/test_cmd_reweight.py (+2/-2)
tests/acceptance_tests/test_model_equivalence.py (+2/-3)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/super_auto_dsig.f (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%couplings.f (+24/-3)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%couplings.f (+24/-7)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%couplings2.f (+20/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%couplings3.f (+0/-35)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%makeinc.inc (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_couplings2.f (+26/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_couplings3.f (+0/-41)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%couplings.f (+24/-3)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%couplings.f (+24/-7)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%couplings2.f (+20/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%couplings3.f (+0/-35)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%makeinc.inc (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_couplings2.f (+26/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_couplings3.f (+0/-41)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%couplings.f (+24/-3)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%couplings.f (+24/-7)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%couplings2.f (+12/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%couplings3.f (+0/-27)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%makeinc.inc (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_couplings2.f (+16/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_couplings3.f (+0/-31)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%couplings.f (+24/-7)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%couplings2.f (+12/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%couplings3.f (+0/-27)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%makeinc.inc (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_couplings2.f (+16/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_couplings3.f (+0/-31)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_input.inc (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%testprog.f (+56/-0)
tests/input_files/SMEFTatNLO_running/CT_couplings.py (+12251/-0)
tests/input_files/SMEFTatNLO_running/CT_vertices.py (+8027/-0)
tests/input_files/SMEFTatNLO_running/__init__.py (+53/-0)
tests/input_files/SMEFTatNLO_running/configuration.py (+14/-0)
tests/input_files/SMEFTatNLO_running/coupling_orders.py (+21/-0)
tests/input_files/SMEFTatNLO_running/couplings.py (+2768/-0)
tests/input_files/SMEFTatNLO_running/function_library.py (+71/-0)
tests/input_files/SMEFTatNLO_running/lorentz.py (+2414/-0)
tests/input_files/SMEFTatNLO_running/object_library.py (+371/-0)
tests/input_files/SMEFTatNLO_running/oldrunning.py (+516/-0)
tests/input_files/SMEFTatNLO_running/param_card.dat (+218/-0)
tests/input_files/SMEFTatNLO_running/parameters.py (+970/-0)
tests/input_files/SMEFTatNLO_running/particles.py (+387/-0)
tests/input_files/SMEFTatNLO_running/propagators.py (+35/-0)
tests/input_files/SMEFTatNLO_running/restrict_4f.dat (+228/-0)
tests/input_files/SMEFTatNLO_running/restrict_LO.dat (+228/-0)
tests/input_files/SMEFTatNLO_running/restrict_NLO.dat (+228/-0)
tests/input_files/SMEFTatNLO_running/running.py (+516/-0)
tests/input_files/SMEFTatNLO_running/vertices.py (+4839/-0)
tests/input_files/SMEFTatNLO_running/write_param_card.py (+184/-0)
tests/input_files/rivet_contur_test.cmd (+32/-0)
tests/input_files/rivet_plot_test.cmd (+12/-0)
tests/parallel_tests/loop_sample_script.py (+1/-1)
tests/parallel_tests/sample_script.py (+1/-1)
tests/test_manager.py (+3/-1)
tests/unit_tests/core/test_base_objects.py (+45/-1)
tests/unit_tests/interface/test_madevent.py (+4/-1)
tests/unit_tests/various/test_banner.py (+8/-1)
tests/unit_tests/various/test_lhe_parser.py (+274/-0)
vendor/IREGI/src/oneloop/create.py (+1/-1)
To merge this branch: bzr merge lp://staging/~maddevelopers/mg5amcnlo/3.4.0
Reviewer Review Type Date Requested Status
MadTeam Pending
Review via email: mp+418754@code.staging.launchpad.net

Commit message

pass to 3.4.0

Description of the change

      SJ: Allowing to use RIVET/CONTUR from madgraph. In presence of scan, such running can also be done
          at the end of the scan. (Contribution from Sihyun Jeon)
      OM: Allow to have EFT operator to run for some special UFO model (quite restricted class of running are supported
          -- corresponding to EFT running --)
      OM: change reweighting/spinmode=onshell (from maddspin) to use the average of the matrix-element when it exists an \
order ambiguity in the matrix element like for the following process:
      p p > e+ ... z, z > e+ e-
      where permuting the momenta of the "e+" does not lead to the same
      matrix-element.
      CF: include notification when jobs are done in the unix notification center if executable notify-send is present.
          Contribution from Carlo Flore.

To post a comment you must log in.
lp://staging/~maddevelopers/mg5amcnlo/3.4.0 updated
985. By Sihyun Jeon

rivet card changes

986. By Sihyun Jeon

test

Revision history for this message
Sihyun Jeon (shjeon) wrote :

986 seems to have overwritten Olivier's fixes but should be all fine

lp://staging/~maddevelopers/mg5amcnlo/3.4.0 updated
987. By Sihyun Jeon

fix contur plot axis handlings, adding some logs

Revision history for this message
Sihyun Jeon (shjeon) wrote :

Hi Olivier,
good that i did some tests earlier.
Found minor glitches when making contur plots.
Added some log so that users can know which step it's going through and where the output is stored

Revision history for this message
Olivier Mattelaer (olivier-mattelaer) wrote :

Yes, don't worry (this is a case where you typically prefer to do a rebase than a merge but it does not matter).

lp://staging/~maddevelopers/mg5amcnlo/3.4.0 updated
988. By olivier-mattelaer

fix a python3 issue

989. By olivier-mattelaer

drop support for python2.7

990. By olivier-mattelaer

update create_release

991. By olivier-mattelaer

fix bug where madspin assign decay to initial state

992. By olivier-mattelaer

Release Candidate

993. By olivier-mattelaer

avoid issue with coupling_order longer than three letter and if the line is slightly too long

994. By olivier-mattelaer

fix parsing issue for loop_filter that had [ within the python expression

995. By olivier-mattelaer

fix a line splitting issue (f77 vs f95) within orders.inc

996. By olivier-mattelaer

fixing a lower/upper case for the Running directory put in Template

997. By olivier-mattelaer

one more lower/upper case issue

998. By olivier-mattelaer

update updatenotes

999. By olivier-mattelaer

merge with LTS for second release candidate

1000. By olivier-mattelaer

fix missing option for rivet/yoda when running from madevent directory

1001. By olivier-mattelaer

smarter condition concerning the output format of the MODEL

1002. By olivier-mattelaer

merge with LTS

1003. By olivier-mattelaer

update standalone to have reweighting working for eft running of the scale + fix a madpin issue with rivet

1004. By olivier-mattelaer

fixing Davide + issue plus some tests

1005. By olivier-mattelaer

fixing some standalone issue related to running

1006. By olivier-mattelaer

update to RC3

1007. By olivier-mattelaer

update to 2.9.10 (official)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: