lp:~maddevelopers/mg5amcnlo/2.1.2
Created by
Rikkert Frederix
and last modified
- Get this branch:
- bzr branch lp:~maddevelopers/mg5amcnlo/2.1.2
Members of
MadDevelopers
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Olivier Mattelaer: Approve
-
Diff: 221195 lines (+125656/-89641)173 files modifiedMadSpin/decay.py (+21/-25)
MadSpin/interface_madspin.py (+0/-4)
MadSpin/src/driver.f (+30/-4)
Template/Common/Cards/delphes_card_ATLAS.dat (+105/-57)
Template/Common/Cards/delphes_card_CMS.dat (+114/-67)
Template/Common/Cards/delphes_card_default.dat (+215/-63)
Template/LO/Cards/pythia_card_default.dat (+4/-0)
Template/LO/Cards/run_card.dat (+2/-2)
Template/LO/README (+11/-0)
Template/LO/README.lhapdf (+0/-27)
Template/LO/Source/PDF/NNPDFDriver.f (+342/-0)
Template/LO/Source/PDF/makefile (+1/-1)
Template/LO/Source/PDF/opendata.f (+1/-1)
Template/LO/Source/PDF/pdf.f (+13/-9)
Template/LO/Source/PDF/pdf_lhapdf.f (+2/-2)
Template/LO/Source/PDF/pdf_list.txt (+6/-0)
Template/LO/Source/PDF/pdfwrap.f (+31/-1)
Template/LO/Source/banner_header.txt (+1/-1)
Template/LO/Source/dsample.f (+5/-1)
Template/LO/Source/is-sud.f (+19/-0)
Template/LO/Source/run.inc (+3/-1)
Template/LO/Source/rw_events.f (+12/-3)
Template/LO/Source/setrun.f (+27/-28)
Template/LO/SubProcesses/reweight.f (+1/-1)
Template/LO/SubProcesses/setcuts.f (+155/-80)
Template/LO/SubProcesses/setscales.f (+3/-7)
Template/LO/bin/internal/make_gridpack (+1/-1)
Template/LO/bin/internal/make_madevent_tar (+1/-1)
Template/LO/bin/internal/put_banner (+0/-112)
Template/LO/bin/madevent (+3/-1)
Template/LO/lib/Pdfdata/NNPDF23_lo_as_0119_qed_mem0.grid (+5182/-0)
Template/LO/lib/Pdfdata/NNPDF23_lo_as_0130_qed_mem0.grid (+5182/-0)
Template/LO/lib/Pdfdata/NNPDF23nlo_as_0119_qed_mem0.grid (+5182/-0)
Template/MadWeight/src/makefile (+2/-2)
Template/NLO/Cards/run_card.dat (+10/-8)
Template/NLO/Cards/shower_card.dat (+2/-0)
Template/NLO/MCatNLO/MCatNLO_MadFKS.inputs (+1/-1)
Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_HERWIG6.Script (+1/-9)
Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_HERWIGPP.Script (+0/-17)
Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_PYTHIA6PT.Script (+0/-9)
Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_PYTHIA6Q.Script (+0/-9)
Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_PYTHIA8.Script (+1/-9)
Template/NLO/MCatNLO/include/HERWIG65.INC (+1/-0)
Template/NLO/MCatNLO/include/JIMMY.INC (+29/-0)
Template/NLO/MCatNLO/include/herwig6521.inc (+363/-0)
Template/NLO/MCatNLO/shower_template.sh (+76/-0)
Template/NLO/MCatNLO/srcCommon/myfastjetfortran.cc (+27/-4)
Template/NLO/MCatNLO/srcHerwig/HERWIG65.INC (+0/-1)
Template/NLO/MCatNLO/srcHerwig/herwig6521.inc (+0/-363)
Template/NLO/MCatNLO/srcHerwig/jimmy.f (+6286/-0)
Template/NLO/MCatNLO/srcHerwig/madfks_hwdriver.f (+81/-34)
Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f (+2/-2)
Template/NLO/MCatNLO/srcPythia/madfks_pydriver.f (+1/-4)
Template/NLO/MCatNLO/srcPythia/madfks_pylhin.f (+2/-2)
Template/NLO/MCatNLO/srcPythia/pythia6426.f (+0/-80864)
Template/NLO/MCatNLO/srcPythia/pythia6428.f (+81739/-0)
Template/NLO/Source/PDF/NNPDFDriver.f (+342/-0)
Template/NLO/Source/PDF/makefile (+1/-1)
Template/NLO/Source/PDF/opendata.f (+1/-1)
Template/NLO/Source/PDF/pdf.f (+13/-9)
Template/NLO/Source/PDF/pdf_lhapdf.f (+10/-3)
Template/NLO/Source/PDF/pdf_list.txt (+6/-0)
Template/NLO/Source/PDF/pdfwrap.f (+31/-1)
Template/NLO/Source/cuts.inc (+3/-3)
Template/NLO/Source/make_opts (+6/-1)
Template/NLO/Source/makefile (+2/-2)
Template/NLO/Source/ranmar.f (+6/-1)
Template/NLO/Source/setrun.f (+9/-3)
Template/NLO/SubProcesses/MCmasses_HERWIG6.inc (+3/-3)
Template/NLO/SubProcesses/MCmasses_HERWIGPP.inc (+1/-1)
Template/NLO/SubProcesses/ajob_template (+7/-6)
Template/NLO/SubProcesses/analyse_opts (+1/-0)
Template/NLO/SubProcesses/cuts.f (+17/-14)
Template/NLO/SubProcesses/cuts.inc (+3/-3)
Template/NLO/SubProcesses/driver_mintFO.f (+1/-1)
Template/NLO/SubProcesses/driver_mintMC.f (+30/-6)
Template/NLO/SubProcesses/fastjet_wrapper.f (+21/-0)
Template/NLO/SubProcesses/fastjetfortran_madfks_core.cc (+22/-3)
Template/NLO/SubProcesses/fastjetfortran_madfks_full.cc (+33/-14)
Template/NLO/SubProcesses/fks_singular.f (+129/-172)
Template/NLO/SubProcesses/handling_lhe_events.f (+49/-7)
Template/NLO/SubProcesses/makefile_fks_dir (+5/-4)
Template/NLO/SubProcesses/montecarlocounter.f (+1626/-5345)
Template/NLO/SubProcesses/setcuts.f (+30/-2)
Template/NLO/SubProcesses/write_event.f (+26/-6)
Template/NLO/Utilities/split_events.f (+3/-2)
Template/NLO/Utilities/sum_plots.f (+34/-123)
Template/NLO/bin/aMCatNLO (+3/-1)
Template/NLO/lib/Pdfdata/NNPDF23_lo_as_0119_qed_mem0.grid (+5182/-0)
Template/NLO/lib/Pdfdata/NNPDF23_lo_as_0130_qed_mem0.grid (+5182/-0)
Template/NLO/lib/Pdfdata/NNPDF23nlo_as_0119_qed_mem0.grid (+5182/-0)
Template/loop_material/StandAlone/Source/makefile (+2/-2)
UpdateNotes.txt (+35/-0)
aloha/__init__.py (+1/-1)
aloha/aloha_writers.py (+7/-2)
aloha/create_aloha.py (+29/-13)
bin/mg5_aMC (+2/-0)
input/.mg5_configuration_default.txt (+5/-0)
madgraph/VERSION (+2/-2)
madgraph/core/base_objects.py (+26/-25)
madgraph/core/diagram_generation.py (+30/-1)
madgraph/fks/fks_helas_objects.py (+1/-0)
madgraph/interface/amcatnlo_interface.py (+4/-4)
madgraph/interface/amcatnlo_run_interface.py (+322/-102)
madgraph/interface/common_run_interface.py (+94/-13)
madgraph/interface/extended_cmd.py (+11/-2)
madgraph/interface/loop_interface.py (+2/-9)
madgraph/interface/madevent_interface.py (+12/-10)
madgraph/interface/madgraph_interface.py (+78/-72)
madgraph/interface/madweight_interface.py (+1/-1)
madgraph/interface/master_interface.py (+1/-1)
madgraph/interface/reweight_interface.py (+35/-0)
madgraph/iolibs/export_fks.py (+8/-9)
madgraph/iolibs/export_v4.py (+91/-23)
madgraph/iolibs/import_v4.py (+7/-3)
madgraph/iolibs/template_files/addmothers.f (+83/-2)
madgraph/iolibs/template_files/loop/improve_ps.inc (+3/-3)
madgraph/iolibs/template_files/madevent_combine_events.f (+22/-9)
madgraph/iolibs/template_files/pythia8_main_example_cc.inc (+1/-1)
madgraph/iolibs/template_files/pythia8_model_parameters_cc.inc (+1/-1)
madgraph/iolibs/template_files/pythia8_model_parameters_h.inc (+3/-3)
madgraph/iolibs/template_files/pythia8_process_h.inc (+2/-2)
madgraph/iolibs/template_files/pythia8_process_hel_amp_h.inc (+2/-2)
madgraph/loop/loop_base_objects.py (+1/-1)
madgraph/various/banner.py (+198/-22)
madgraph/various/cluster.py (+2/-1)
madgraph/various/combine_runs.py (+3/-2)
madgraph/various/lhe_parser.py (+33/-2)
madgraph/various/misc.py (+39/-15)
madgraph/various/shower_card.py (+2/-2)
mg5decay/decay_objects.py (+2/-2)
models/hgg_plugin/couplings.py (+3/-0)
models/hgg_plugin/parameters.py (+11/-0)
models/hgg_plugin/particles.py (+12/-0)
models/hgg_plugin/vertices.py (+6/-0)
models/import_ufo.py (+27/-7)
models/taudecay_UFO/Fortran/functions.f (+241/-0)
models/taudecay_UFO/__init__.py (+2/-2)
models/taudecay_UFO/coupling_orders.py (+2/-2)
models/taudecay_UFO/couplings.py (+30/-2)
models/taudecay_UFO/lorentz.py (+54/-2)
models/taudecay_UFO/parameters.py (+47/-23)
models/taudecay_UFO/particles.py (+58/-2)
models/taudecay_UFO/propagators.py (+1/-1)
models/taudecay_UFO/taudecay_UFO.log (+11/-10)
models/taudecay_UFO/vertices.py (+78/-7)
models/usermod.py (+24/-6)
tests/acceptance_tests/test_cmd.py (+1/-0)
tests/acceptance_tests/test_cmd_amcatnlo.py (+28/-4)
tests/acceptance_tests/test_cmd_madevent.py (+2/-1)
tests/input_files/IOTestsComparison/TestMadWeight/modification_to_cuts/cuts.f.tmp (+0/-1307)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/improve_ps.f (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/improve_ps.f (+5/-5)
tests/parallel_tests/compare_with_old_mg5_version.py (+7/-7)
tests/parallel_tests/decay_comparator.py (+44/-22)
tests/parallel_tests/madevent_comparator.py (+2/-1)
tests/time_db (+136/-123)
tests/unit_tests/iolibs/test_export_cpp.py (+6/-6)
tests/unit_tests/madspin/test_madspin.py (+16/-15)
tests/unit_tests/various/test_aloha.py (+23/-0)
tests/unit_tests/various/test_shower_card.py (+4/-0)
vendor/CutTools/src/avh/avh_olo.f90 (+1/-1)
vendor/StdHEP/mcfio/src/mcf_evt_xdr.c (+197/-85)
vendor/StdHEP/mcfio/src/mcf_xdr.h (+3/-3)
vendor/StdHEP/mcfio/src/mcfio_Block.c (+1/-1)
vendor/StdHEP/mcfio/src/mcfio_Direct.c (+11/-15)
Related bugs
Bug #1315134: v4 pickle not respecting read-only disk | Undecided | Fix Released |
Related blueprints
Branch information
Recent revisions
- 330. By Olivier Mattelaer
-
fix a bug in MadSpin which occur when some of the partial width are define but not all of them.
- 329. By Olivier Mattelaer
-
Revision from Rikkert Frederix (merged by me for simplicity)
The uncertainty as written in the results.dat files (and are put on
the HTML pages) should be the uncertainty on the cross section, not
the ABS(cross section). - 328. By Olivier Mattelaer
-
merge with clang branch
- 327. By Olivier Mattelaer
-
merge the branch clustertag.
allowing to have lhef v3 compliant format for the event file. - 326. By Rikkert Frederix
-
increased the difficulty_
threshold to 100, and repharsed the message
that appears when a user tries a process 'of challenging difficulty'. - 325. By marco zaro
-
merged with 2.1.2_showercluster
- 323. By Olivier Mattelaer
-
merge with nndpf branch
- 322. By Olivier Mattelaer
-
merge with the colorflow branch
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:mg5amcnlo/lts