MadGraph5_aMC@NLO

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

dis_nlo
Merge into 3.x

Proposed by Laboni Manna on 2021-08-04

Status:	Needs review
Proposed branch:	lp://staging/~maddevelopers/mg5amcnlo/dis_nlo
Merge into:	lp://staging/mg5amcnlo
Diff against target:	2739 lines (+2174/-108) 18 files modified Template/LO/Cards/pythia8_card_default.dat (+4/-0) Template/LO/Cards/run_card.dat (+1/-1) Template/NLO/Source/PDF/PhotonFlux.f (+9/-8) Template/NLO/Source/PDF/makefile (+2/-2) Template/NLO/Source/PDF/pdf.f (+2/-2) Template/NLO/Source/PDF/pdg2pdf.f (+2/-2) Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f (+13/-3) Template/NLO/Source/run.inc (+6/-4) Template/NLO/Source/run_printout.f (+12/-6) Template/NLO/Source/setrun.f (+1/-1) Template/NLO/SubProcesses/driver_mintFO.f (+10/-8) Template/NLO/SubProcesses/driver_mintMC.f (+11/-9) Template/NLO/SubProcesses/fks_singular.f (+142/-25) Template/NLO/SubProcesses/genps_fks.f (+1/-7) Template/NLO/SubProcesses/madfks_plot.f (+10/-2) Template/NLO/SubProcesses/reweight.f.THIS (+1708/-0) Template/NLO/SubProcesses/setscales.f (+20/-7) madgraph/various/banner.py (+220/-21)
To merge this branch:	bzr merge lp://staging/~maddevelopers/mg5amcnlo/dis_nlo
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Mattelaer		2021-08-04	Pending
Review via email: mp+406633@code.staging.launchpad.net

Commit message

Hi Olivier,

I have added some comments and modifications based on your review though I have some confusion with 1 or 2 part which I want to modify after a short discussion with you.

thanks!

laboni

Revision history for this message

Olivier Mattelaer (olivier-mattelaer) wrote on 2021-08-04:

Hi,

I have not done any check on running the code/ checking cross-section/behavior/...
Neither check that additional line might need modification (or not).
So I just read the diff file below and check that the change sounds reasonable.
Additionally, I have added some note on the "coding style".

Olivier

PS: For other reading this, This will obviously never be "approved" since the target is not valid (i.e. this need to merged in another branch) but this is not critical for the moment.

Revision history for this message

Olivier Mattelaer (olivier-mattelaer) wrote on 2021-10-12:

Hi Laboni,

I have done a new review of those change and the comments (30 of them) are done directly in the diff files.

Cheers,

Olivier

Revision history for this message

Olivier Mattelaer (olivier-mattelaer) wrote on 2021-10-12:

Please also check that all previous comment are handle, I do see that some of them have not been handle and this worried me a bit...

if needed track all comment one by one in a gitlab issue to be sure that they are all answered/handled/...

lp://staging/~maddevelopers/mg5amcnlo/dis_nlo updated on 2021-10-14

971. By Laboni Manna on 2021-10-14: allow photon-proton collisions in MG5

Revision history for this message

Laboni Manna (labonimanna) wrote on 2021-10-14:

version 971 is overwritten by systematics.py

Revision history for this message

Laboni Manna (labonimanna) on 2021-10-18:

lp://staging/~maddevelopers/mg5amcnlo/dis_nlo updated on 2021-10-18

972. By Laboni Manna on 2021-10-18: Included some modification after a review by Olivier

Revision history for this message

Olivier Mattelaer (olivier-mattelaer) wrote on 2021-11-24:

Ok I have replied to your comment.
So please also merge with 3.3.0 and solve all related conflict

lp://staging/~maddevelopers/mg5amcnlo/dis_nlo updated on 2023-10-16

973. By Laboni Manna on 2022-02-18: allow photo production in MG5 3.3.0
974. By Laboni Manna on 2022-05-25: merge dis_nlo with new version of MG5 3.4.0
975. By Laboni Manna on 2022-06-01: Merge with mg5 version 3.4.0
976. By Laboni Manna on 2022-06-02: merge with new version of MG5
977. By Laboni Manna on 2022-06-30: allow dis_LO shower
978. By Laboni Manna on 2023-10-16: To warn for photon from Proton case

Unmerged revisions

978. By Laboni Manna on 2023-10-16: To warn for photon from Proton case
977. By Laboni Manna on 2022-06-30: allow dis_LO shower
976. By Laboni Manna on 2022-06-02: merge with new version of MG5
975. By Laboni Manna on 2022-06-01: Merge with mg5 version 3.4.0
974. By Laboni Manna on 2022-05-25: merge dis_nlo with new version of MG5 3.4.0
973. By Laboni Manna on 2022-02-18: allow photo production in MG5 3.3.0
972. By Laboni Manna on 2021-10-18: Included some modification after a review by Olivier
971. By Laboni Manna on 2021-10-14: allow photon-proton collisions in MG5
970. By Laboni Manna on 2021-08-04: EPA_Fixed_scale at NLO
969. By Laboni Manna on 2021-07-26: avoid forced pdf for lepton-proton cases