Merge lp://staging/~maddevelopers/mg5amcnlo/3.3.1 into lp://staging/mg5amcnlo
Proposed by
Olivier Mattelaer
| Status: | Rejected |
|---|---|
| Rejected by: | Olivier Mattelaer |
| Proposed branch: | lp://staging/~maddevelopers/mg5amcnlo/3.3.1 |
| Merge into: | lp://staging/mg5amcnlo |
| Diff against target: |
4392 lines (+1717/-1468) 29 files modified
MadSpin/decay.py (+5/-5) MadSpin/interface_madspin.py (+18/-8) Template/NLO/Source/extra_weights.f (+1/-1) Template/NLO/SubProcesses/add_write_info.f (+38/-30) Template/NLO/SubProcesses/cluster.f (+19/-7) Template/NLO/SubProcesses/driver_mintFO.f (+4/-0) Template/NLO/SubProcesses/driver_mintMC.f (+1247/-1243) Template/NLO/SubProcesses/fks_singular.f (+143/-28) UpdateNotes.txt (+24/-2) VERSION (+2/-2) madgraph/interface/amcatnlo_interface.py (+10/-4) madgraph/interface/amcatnlo_run_interface.py (+12/-14) madgraph/interface/common_run_interface.py (+12/-12) madgraph/interface/madevent_interface.py (+17/-7) madgraph/interface/madgraph_interface.py (+16/-13) madgraph/interface/reweight_interface.py (+3/-3) madgraph/iolibs/export_fks.py (+33/-1) madgraph/iolibs/export_v4.py (+1/-1) madgraph/madevent/gen_ximprove.py (+2/-2) madgraph/various/cluster.py (+27/-27) madgraph/various/hepmc_parser.py (+7/-6) madgraph/various/histograms.py (+5/-7) madgraph/various/lhe_parser.py (+9/-8) madgraph/various/misc.py (+30/-15) madgraph/various/process_checks.py (+8/-8) madgraph/various/systematics.py (+13/-6) models/import_ufo.py (+1/-1) tests/acceptance_tests/test_cmd_madevent.py (+8/-5) tests/unit_tests/iolibs/test_export_fks.py (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~maddevelopers/mg5amcnlo/3.3.1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Olivier Mattelaer | Disapprove | ||
|
Review via email:
|
|||
Description of the change
Fixing side effect of python3 ordering
- python 3.10 was not compatible
- issue when running from Process directory
Fixing bug for starting shower scale
Fixing bias in madspin due to too many reset of the seed due to the various package chain.
To post a comment you must log in.
Unmerged revisions
- 981. By marco zaro
-
orderstag_glob is now determined by the python code, not read from logs
- 980. By olivier-mattelaer
-
reintroduce path from Marco/rik:
- Rik: Fix for LOonly and filling of H-event information (array out of bounds). [add_write_info.f]
- marco: fix in extra_weights.f for an out-of-bounds array error [extra-weights] - 979. By olivier-mattelaer
-
merge with 2.9.7
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Ok, this branch will not be merged due to the spurious conflict.
I have created another one 3.1.1_new_merge which should (or at least will be cleaner)
just for reference an method to handle future spurious merge issue related to \r\n vs \n
issue is to do the following steps:
1. Go to the directory of the file
2. Convert X.BASE X.THIS X.OTHER to the same format (using either unix2dos or dos2unix)
3. diff3 -m X.THIS X.BASE X.OTHER > X
4. Fix remaining conflict as needed
in this case the change from \r\n to \n inside fks_singular was done in the development branch of 3.x three years ago, so the above method is likely the needed one (before our move to git?)
PS@marco, do not worry I will check/include your revision 981 in the other branch