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

Proposed by Olivier Mattelaer
Status: Merged
Merged at revision: 971
Proposed branch: lp://staging/~maddevelopers/mg5amcnlo/3.3.2
Merge into: lp://staging/mg5amcnlo
Diff against target: 12435 lines (+10358/-561)
60 files modified
MadSpin/decay.py (+5/-1)
MadSpin/interface_madspin.py (+5/-3)
MadSpin/src/driver.f (+1/-2)
Template/LO/Cards/run_card.dat (+2/-2)
Template/LO/Source/dsample.f (+3/-1)
Template/LO/SubProcesses/genps.f (+0/-415)
Template/LO/SubProcesses/refine.sh (+4/-2)
Template/LO/bin/internal/merge.pl (+28/-17)
Template/NLO/MCatNLO/srcPythia8/Pythia82_enhanceUH.cc (+2/-2)
Template/NLO/MCatNLO/srcPythia8/Pythia83.cc (+2/-2)
Template/NLO/SubProcesses/cuts.f (+18/-1)
Template/NLO/SubProcesses/makefile_fks_dir (+10/-4)
UpdateNotes.txt (+29/-0)
VERSION (+2/-2)
madgraph/fks/fks_base.py (+7/-3)
madgraph/interface/amcatnlo_interface.py (+11/-2)
madgraph/interface/madgraph_interface.py (+7/-4)
madgraph/interface/master_interface.py (+6/-1)
madgraph/iolibs/export_fks.py (+13/-7)
madgraph/iolibs/export_v4.py (+11/-3)
madgraph/iolibs/template_files/born_cnt_splitorders_fks.inc (+1/-0)
madgraph/iolibs/template_files/matrix_madevent_group_v4.inc (+2/-0)
madgraph/iolibs/template_files/matrix_madevent_group_v4_hel.inc (+2/-0)
madgraph/loop/loop_base_objects.py (+2/-1)
madgraph/madevent/hel_recycle.py (+7/-11)
madgraph/various/banner.py (+15/-7)
madgraph/various/diagram_symmetry.py (+11/-1)
madgraph/various/lhe_parser.py (+17/-12)
madgraph/various/misc.py (+3/-2)
mg5decay/decay_objects.py (+7/-7)
models/usermod.py (+2/-1)
tests/acceptance_tests/test_cmd.py (+15/-9)
tests/acceptance_tests/test_cmd_amcatnlo.py (+2/-2)
tests/acceptance_tests/test_cmd_madevent.py (+5/-5)
tests/acceptance_tests/test_cmd_reweight.py (+1/-1)
tests/acceptance_tests/test_madspin.py (+65/-1)
tests/input_files/231_Model_UFO/CT_couplings.py (+11/-0)
tests/input_files/231_Model_UFO/__init__.py (+50/-0)
tests/input_files/231_Model_UFO/coupling_orders.py (+16/-0)
tests/input_files/231_Model_UFO/couplings.py (+2783/-0)
tests/input_files/231_Model_UFO/function_library.py (+71/-0)
tests/input_files/231_Model_UFO/lorentz.py (+102/-0)
tests/input_files/231_Model_UFO/object_library.py (+373/-0)
tests/input_files/231_Model_UFO/parameters.py (+1161/-0)
tests/input_files/231_Model_UFO/particles.py (+444/-0)
tests/input_files/231_Model_UFO/propagators.py (+35/-0)
tests/input_files/231_Model_UFO/vertices.py (+4589/-0)
tests/input_files/231_Model_UFO/write_param_card.py (+182/-0)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/configs.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/matrix1.f (+2/-0)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/configs.inc (+4/-0)
tests/parallel_tests/test_cmd_amcatnlo.py (+2/-1)
tests/test_manager.py (+8/-5)
tests/unit_tests/core/test_helas_objects.py (+1/-1)
tests/unit_tests/iolibs/test_export_v4.py (+140/-6)
tests/unit_tests/various/test_banner.py (+2/-2)
tests/unit_tests/various/test_cmd.py (+26/-11)
tests/unit_tests/various/test_import_ufo.py (+16/-0)
tests/unit_tests/various/test_lhe_parser.py (+1/-1)
tests/unit_tests/various/test_misc.py (+12/-0)
To merge this branch: bzr merge lp://staging/~maddevelopers/mg5amcnlo/3.3.2
Reviewer Review Type Date Requested Status
Olivier Mattelaer Approve
Review via email: mp+416581@code.staging.launchpad.net

Commit message

bug fixing

To post a comment you must log in.
Revision history for this message
marco zaro (marco-zaro) wrote :
Download full text (533.2 KiB)

Hi Olivier, all,

I would say we should include this branch
https://code.launchpad.net/~maddevelopers/mg5amcnlo/3.3.2-photonsokinqcd

in 3.3.2…
can we review it?

Cheers,

Marco
> On 9 Mar 2022, at 09:16, Olivier Mattelaer <email address hidden> wrote:
>
> Olivier Mattelaer has proposed merging lp:~maddevelopers/mg5amcnlo/3.3.2 into lp:mg5amcnlo.
>
> Commit message:
> bug fixing
>
> Requested reviews:
> MadTeam (madteam)
>
> For more details, see:
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/3.3.2/+merge/416581
> --
> The attached diff has been truncated due to its size.
> Your team MadTeam is requested to review the proposed merge of lp:~maddevelopers/mg5amcnlo/3.3.2 into lp:mg5amcnlo.
> === modified file 'MadSpin/decay.py'
> --- MadSpin/decay.py 2021-12-03 15:40:10 +0000
> +++ MadSpin/decay.py 2022-03-09 08:16:13 +0000
> @@ -2469,7 +2469,11 @@
> #no decays for this production mode, run in passthrough mode, only adding the helicities to the events
> nb_mc_masses=0
> p, p_str=self.curr_event.give_momenta(event_map)
> - stdin_text=' %s %s %s %s \n' % ('2', self.options['BW_cut'], self.Ecollider, 1.0, self.options['frame_id'])
> + try:
> + frameid = self.options['frame_id']
> + except KeyError:
> + frameid = 6
> + stdin_text=' %s %s %s %s %s\n' % ('2', self.options['BW_cut'], self.Ecollider, 1.0, frameid)
> stdin_text+=p_str
> # here I also need to specify the Monte Carlo Masses
> stdin_text+=" %s \n" % nb_mc_masses
>
> === modified file 'MadSpin/interface_madspin.py'
> --- MadSpin/interface_madspin.py 2021-12-03 15:40:10 +0000
> +++ MadSpin/interface_madspin.py 2022-03-09 08:16:13 +0000
> @@ -633,8 +633,9 @@
> if pid in self.final_state:
> break
> else:
> - logger.info("Nothing to decay ...")
> - return
> + if not self.options['onlyhelicity']:
> + logger.info("Nothing to decay ...")
> + return
>
>
> model_line = self.banner.get('proc_card', 'full_model_line')
> @@ -715,7 +716,8 @@
> generate_all.all_decay = eval(generate_all.all_decay)
> for me in generate_all.all_ME:
> for d in generate_all.all_ME[me]['decays']:
> - d['decay_struct'] = eval(d['decay_struct'])
> + if isinstance(d['decay_struct'], str):
> + d['decay_struct'] = eval(d['decay_struct'])
>
>
> # Re-create information which are not save in the pickle.
>
> === modified file 'MadSpin/src/driver.f'
> --- MadSpin/src/driver.f 2020-01-15 18:23:15 +0000
> +++ MadSpin/src/driver.f 2022-03-09 08:16:13 +0000
> @@ -1533,8 +1533,7 @@
> m(ibranch-1)=m2_tchan(ibranch)
> else
> ivar=ivar+1
> - m(ibranch-1)=dsqrt((smax-smin)*
> - & x(ivar))
> + m(ibranch-1)=dsqrt((smax-smin)*x(ivar) + smin)
> m2_tchan(ibranch)=m(ibranch-1)
> xjac0 = xjac0*(smax-smin)
> endif
>
> === modified file 'Template/LO/Cards/run_card.dat'
> --- Template/LO/Cards/run_card.dat 2021-10-30 16:15:39 +0000
> +...

987. By olivier-mattelaer

fix an issue with the conversion from NLO syntax to loop-induced

988. By olivier-mattelaer

more security aroung max_n_loop

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

@frederix: Is the heft bug is fixed?
I still have two acceptance test crashing related to that:

test_nlo_output2 and test_loop_improved_reweighting
(where I would need to regenerate the lhe file to make the test to pass since the input lhe file is correctly using the v2.x syntax for the weight information)

But since this issue is quite old now, I would release 3.3.2 independtly of that.

review: Approve
989. By olivier-mattelaer

merge with /3.3.2-photonsokinqcd

990. By olivier-mattelaer

making lhe parser to be able to run without banner --for madspin-- + allow --debug for the test manager

Revision history for this message
Rikkert Frederix (frederix) wrote :

Hi Olivier,

I do not know if the heft bug is fixed. I haven't look into it at all.

Best,
Rikkert

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: