Merge lp://staging/~mg5core1/mg5amcnlo/2.6.6 into lp://staging/mg5amcnlo/lts
Proposed by
Olivier Mattelaer
| Status: | Merged |
|---|---|
| Merged at revision: | 282 |
| Proposed branch: | lp://staging/~mg5core1/mg5amcnlo/2.6.6 |
| Merge into: | lp://staging/mg5amcnlo/lts |
| Diff against target: |
4242 lines (+1277/-823) 58 files modified
Template/LO/Cards/run_card.dat (+1/-14) Template/LO/Source/BIAS/ptj_bias/makefile (+1/-5) Template/LO/Source/PDF/pdg2pdf.f (+8/-5) Template/LO/Source/PDF/pdg2pdf_lhapdf.f (+1/-0) Template/LO/Source/PDF/pdg2pdf_lhapdf6.f (+8/-5) Template/LO/SubProcesses/dummy_fct.f (+10/-0) Template/LO/SubProcesses/genps.f (+10/-4) Template/LO/SubProcesses/myamp.f (+1/-1) Template/LO/SubProcesses/reweight.f (+1/-1) Template/LO/SubProcesses/setcuts.f (+9/-2) Template/NLO/Source/PDF/pdg2pdf.f (+8/-5) Template/NLO/Source/PDF/pdg2pdf_lhapdf.f (+8/-5) Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f (+8/-5) Template/NLO/SubProcesses/fks_singular.f (+6/-4) Template/NLO/SubProcesses/genps_fks.f (+1/-0) Template/NLO/SubProcesses/handling_lhe_events.f (+1/-1) Template/NLO/SubProcesses/write_event.f (+1/-1) Template/loop_material/StandAlone/SubProcesses/makefile (+2/-2) UpdateNotes.txt (+17/-0) VERSION (+1/-1) bin/mg5_aMC (+7/-0) madgraph/core/base_objects.py (+2/-0) madgraph/core/diagram_generation.py (+4/-3) madgraph/core/drawing.py (+1/-1) madgraph/core/helas_objects.py (+6/-3) madgraph/fks/fks_common.py (+18/-4) madgraph/fks/fks_helas_objects.py (+13/-0) madgraph/interface/common_run_interface.py (+99/-39) madgraph/interface/extended_cmd.py (+3/-2) madgraph/interface/madevent_interface.py (+60/-79) madgraph/interface/madgraph_interface.py (+34/-7) madgraph/interface/master_interface.py (+18/-8) madgraph/interface/reweight_interface.py (+12/-4) madgraph/iolibs/export_v4.py (+32/-1) madgraph/iolibs/template_files/madevent_makefile_source (+4/-5) madgraph/iolibs/template_files/matrix_madevent_v4.inc (+1/-1) madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_cc.inc (+47/-45) madgraph/iolibs/template_files/pythia8/pythia8_model_parameters_h.inc (+5/-3) madgraph/loop/loop_exporters.py (+1/-1) madgraph/various/banner.py (+103/-41) madgraph/various/diagram_symmetry.py (+7/-2) madgraph/various/histograms.py (+138/-112) madgraph/various/lhe_parser.py (+33/-12) madgraph/various/misc.py (+59/-16) madgraph/various/shower_card.py (+38/-31) models/check_param_card.py (+3/-0) models/import_ufo.py (+28/-5) models/write_param_card.py (+4/-3) tests/acceptance_tests/test_cmd.py (+6/-6) tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f (+2/-2) tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/CKKWL_djrs_output.gnuplot (+53/-54) tests/input_files/IOTestsComparison/IOHistogramTest/DJR_histograms/MLM_djrs_output.gnuplot (+53/-54) tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot (+53/-54) tests/time_db (+91/-89) tests/unit_tests/iolibs/test_export_cpp.py (+50/-46) tests/unit_tests/various/test_banner.py (+42/-0) tests/unit_tests/various/test_shower_card.py (+16/-1) tests/unit_tests/various/test_write_param.py (+28/-28) |
| To merge this branch: | bzr merge lp://staging/~mg5core1/mg5amcnlo/2.6.6 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Olivier Mattelaer | Approve | ||
|
Review via email:
|
|||
Commit message
Time to release this branch
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
All tests are passing now.
And I made a review of the code and everything sounds fine.
This is a quite minor release (bug fixing)
before two "big" one in the 2.x series
2.7.0 will contains a LOT of new feature
2.8.0 will (only) be the porting to python3.0