Merge lp://staging/~maddevelopers/mg5amcnlo/controlswitch into lp://staging/~mg5core1/mg5amcnlo/2.5.6
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~maddevelopers/mg5amcnlo/controlswitch |
| Merge into: | lp://staging/~mg5core1/mg5amcnlo/2.5.6 |
| Diff against target: |
1767 lines (+1113/-488) 3 files modified
madgraph/interface/amcatnlo_run_interface.py (+295/-186) madgraph/interface/extended_cmd.py (+481/-27) madgraph/interface/madevent_interface.py (+337/-275) |
| To merge this branch: | bzr merge lp://staging/~maddevelopers/mg5amcnlo/controlswitch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Rikkert Frederix | Pending | ||
| marco zaro | Pending | ||
| Valentin Hirschi | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2017-08-17.
Description of the change
Hi,
This branch refactor the code on how to ask to the user which code to run.
The idea is to have dedicated class for that to ease the possibility to edit such crucial
part of the interface via plugin method.
For that reason, this code use highly modular method and factorise the different step in a quite deep way. This makes the new code much longer than the equivalent one that it replaces.
For the user point of view the change are actually quite minimal:
1) Change the description to fit on 80 char shell.
2) Change question presentation @NLO to match the one already present @LO
3) New method for the gestion of conflict:
- The previous user value is not overwritten directly anymore
- The conflicted value is now set in red and the "replacement" value is set after an arrow
- This allows to allow to use the cycle trough options without creating annoying side effects
4) The cycle trough option is now available for all options
5) the user can now set multiple switch with a single line (need to be separated by ";")
This should not be part of 2.5.6/2.6.0 but rather part of 2.6.1, at the same time,
I would like to have it merged in 2.6.1 as soon as possible such that we have plenty of time to discover potential side effects/error in the conflict handling.
| Rikkert Frederix (frederix) wrote | # |
| Olivier Mattelaer (olivier-mattelaer) wrote | # |
Unmerged revisions
- 337. By olivier-mattelaer
-
merge with latest 2.6.1
- 336. By olivier-mattelaer
-
fixing problem revealed by test suite
- 335. By olivier-mattelaer
-
merge with latest 2.6.1
- 334. By olivier-mattelaer
-
improve the handling of scripting method.
- 333. By olivier-mattelaer
-
improvment associated to the PS choice
- 332. By olivier-mattelaer
-
allow to choose the shower before the edition of the card
- 331. By olivier-mattelaer
-
first change related to Valentin review
- 330. By olivier-mattelaer
-
fix problem with script and command not accepted due to the missing;
- 329. By olivier-mattelaer
-
fix some displayed problem pointed by Stefano when some program are not available
- 328. By olivier-mattelaer
-
fix problem when some program are not installed + allowed 1=PY8
Hi Olivier,
Shouldn't the merge target be something different than 2.5.6?
Cheers,
Rik