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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Mattelaer | Approve | ||
Review via email:
|
Commit message
bug fixing
To post a comment you must log in.
Hi Olivier, all,
I would say we should include this branch /code.launchpad .net/~maddevelo pers/mg5amcnlo/ 3.3.2-photonsok inqcd
https:/
in 3.3.2…
can we review it?
Cheers,
Marco /code.launchpad .net/~maddevelo pers/mg5amcnlo/ 3.3.2/+ merge/416581 curr_event. give_momenta( event_map) 'BW_cut' ], self.Ecollider, 1.0, self.options[ 'frame_ id']) 'frame_ id'] 'BW_cut' ], self.Ecollider, 1.0, frameid) interface_ madspin. py' interface_ madspin. py 2021-12-03 15:40:10 +0000 interface_ madspin. py 2022-03-09 08:16:13 +0000 info("Nothing to decay ...") 'onlyhelicity' ]: info("Nothing to decay ...") get('proc_ card', 'full_model_line') all.all_ decay = eval(generate_ all.all_ decay) all.all_ ME: all.all_ ME[me][ 'decays' ]: 'decay_ struct' ]) d['decay_ struct' ], str): 'decay_ struct' ]) src/driver. f' src/driver. f 2020-01-15 18:23:15 +0000 src/driver. f 2022-03-09 08:16:13 +0000 1)=m2_tchan( ibranch) 1)=dsqrt( (smax-smin) * 1)=dsqrt( (smax-smin) *x(ivar) + smin) ibranch) =m(ibranch- 1) LO/Cards/ run_card. dat' LO/Cards/ run_card. dat 2021-10-30 16:15:39 +0000
> 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:/
> --
> 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.
> - stdin_text=' %s %s %s %s \n' % ('2', self.options[
> + try:
> + frameid = self.options[
> + except KeyError:
> + frameid = 6
> + stdin_text=' %s %s %s %s %s\n' % ('2', self.options[
> stdin_text+=p_str
> # here I also need to specify the Monte Carlo Masses
> stdin_text+=" %s \n" % nb_mc_masses
>
> === modified file 'MadSpin/
> --- MadSpin/
> +++ MadSpin/
> @@ -633,8 +633,9 @@
> if pid in self.final_state:
> break
> else:
> - logger.
> - return
> + if not self.options[
> + logger.
> + return
>
>
> model_line = self.banner.
> @@ -715,7 +716,8 @@
> generate_
> for me in generate_
> for d in generate_
> - d['decay_struct'] = eval(d[
> + if isinstance(
> + d['decay_struct'] = eval(d[
>
>
> # Re-create information which are not save in the pickle.
>
> === modified file 'MadSpin/
> --- MadSpin/
> +++ MadSpin/
> @@ -1533,8 +1533,7 @@
> m(ibranch-
> else
> ivar=ivar+1
> - m(ibranch-
> - & x(ivar))
> + m(ibranch-
> m2_tchan(
> xjac0 = xjac0*(smax-smin)
> endif
>
> === modified file 'Template/
> --- Template/
> +...