lp:~maddevelopers/mg5amcnlo/2.6.2_heavyion

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mg5core1/mg5amcnlo/2.6.2 at revision 333

Valentin Hirschi: Approve on 2018-04-18

Diff: 7738 lines (+899/-5978) (has conflicts)

35 files modified

Template/LO/Cards/run_card.dat (+3/-6)
Template/LO/Source/PDF/Ctq4Fn.f (+0/-122)
Template/LO/Source/PDF/Ctq5Par.f (+0/-711)
Template/LO/Source/PDF/Ctq5Pdf.f (+0/-344)
Template/LO/Source/PDF/Partonx5.f (+0/-94)
Template/LO/Source/PDF/PhotonFlux.f (+37/-0)
Template/LO/Source/PDF/cteq3.f (+0/-498)
Template/LO/Source/PDF/jeppe02.f (+0/-160)
Template/LO/Source/PDF/makefile (+1/-3)
Template/LO/Source/PDF/mrs98.f (+0/-506)
Template/LO/Source/PDF/mrs98ht.f (+0/-133)
Template/LO/Source/PDF/mrs98lo.f (+0/-508)
Template/LO/Source/PDF/mrs99.f (+0/-1166)
Template/LO/Source/PDF/mrst2001.f (+0/-513)
Template/LO/Source/PDF/mrst2002.f (+0/-264)
Template/LO/Source/PDF/pdf.f (+228/-227)
Template/LO/Source/PDF/pdfwrap.f (+130/-141)
Template/LO/Source/PDF/pdg2pdf.f (+47/-82)
Template/LO/Source/PDF/pdg2pdf_lhapdf.f (+32/-14)
Template/LO/Source/PDF/pdg2pdf_lhapdf6.f (+46/-14)
Template/LO/Source/gensudgrid.f (+0/-124)
Template/LO/Source/is-sud.f (+0/-254)
Template/LO/Source/run.inc (+8/-0)
Template/LO/SubProcesses/genps.f (+2/-0)
Template/LO/SubProcesses/reweight.f (+8/-8)
UpdateNotes.txt (+30/-10)
madgraph/interface/common_run_interface.py (+82/-8)
madgraph/iolibs/export_v4.py (+4/-3)
madgraph/iolibs/template_files/madevent_symmetry.f (+4/-2)
madgraph/various/banner.py (+150/-30)
madgraph/various/systematics.py (+84/-19)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%genps.inc.moved (+0/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%genps.inc.moved (+0/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%genps.inc.moved (+0/-4)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/auto_dsig.f (+3/-2)

api

Rejected for merging into lp:mg5amcnlo/lts

MadTeam: Pending requested 2018-03-27

Diff: 7538 lines (+810/-5959)

34 files modified

Template/LO/Cards/run_card.dat (+3/-6)
Template/LO/Source/PDF/Ctq4Fn.f (+0/-122)
Template/LO/Source/PDF/Ctq5Par.f (+0/-711)
Template/LO/Source/PDF/Ctq5Pdf.f (+0/-344)
Template/LO/Source/PDF/Partonx5.f (+0/-94)
Template/LO/Source/PDF/PhotonFlux.f (+37/-0)
Template/LO/Source/PDF/cteq3.f (+0/-498)
Template/LO/Source/PDF/jeppe02.f (+0/-160)
Template/LO/Source/PDF/makefile (+1/-3)
Template/LO/Source/PDF/mrs98.f (+0/-506)
Template/LO/Source/PDF/mrs98ht.f (+0/-133)
Template/LO/Source/PDF/mrs98lo.f (+0/-508)
Template/LO/Source/PDF/mrs99.f (+0/-1166)
Template/LO/Source/PDF/mrst2001.f (+0/-513)
Template/LO/Source/PDF/mrst2002.f (+0/-264)
Template/LO/Source/PDF/pdf.f (+228/-227)
Template/LO/Source/PDF/pdfwrap.f (+130/-141)
Template/LO/Source/PDF/pdg2pdf.f (+47/-82)
Template/LO/Source/PDF/pdg2pdf_lhapdf.f (+32/-14)
Template/LO/Source/PDF/pdg2pdf_lhapdf6.f (+46/-14)
Template/LO/Source/gensudgrid.f (+0/-124)
Template/LO/Source/is-sud.f (+0/-254)
Template/LO/Source/run.inc (+8/-0)
Template/LO/SubProcesses/genps.f (+2/-0)
Template/LO/SubProcesses/reweight.f (+8/-8)
madgraph/interface/common_run_interface.py (+27/-3)
madgraph/iolibs/export_v4.py (+4/-3)
madgraph/iolibs/template_files/madevent_symmetry.f (+4/-2)
madgraph/various/banner.py (+146/-26)
madgraph/various/systematics.py (+84/-19)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%genps.inc.moved (+0/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%genps.inc.moved (+0/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%genps.inc.moved (+0/-4)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/auto_dsig.f (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

310. By olivier-mattelaer on 2018-04-20

fix a bug and add a security to avoid using assymetric beam when not supported

309. By olivier-mattelaer on 2018-03-27

improve UpdateNotes

308. By olivier-mattelaer on 2018-03-27

write the run_card/param_card when needed and not at all commands

307. By olivier-mattelaer on 2018-03-26

allow to define block of optional entry in the run_card (with nice templating)

306. By olivier-mattelaer on 2018-03-25

handle correctly ion beam in systematics.py

305. By olivier-mattelaer on 2018-03-16

fixing symmetry.f to have correctly the computation of sqrts in the choice of channel

304. By olivier-mattelaer on 2018-03-16

merging with latest maddm_dev2 (364)

303. By olivier-mattelaer on 2018-03-16

fixing tests

302. By olivier-mattelaer on 2018-03-11

set the PDF normalisation to get the expected scaling

301. By olivier-mattelaer on 2018-03-11

merge with latest 2.6.2/maddm_dev