Adapt to ThOr functor and algorithm naming changes

Follows the changes in Rec!2456 (merged) and Phys!945 (merged). Relevant here are changes to some test options:

• MASS functor no longer needs to be given mass hypotheses.
• Combiner changes:
  • Property names are different (Comb12Cut -> CombinationCut).
  • Accepts a single decay descriptor.
  • Accepts one input container per child.

I also took the liberty of making a few clean-ups (moving imports to the top of the file, removing unused imports) and updated the test reference. Note that the number of accepted candidates has not changed.

Requires Rec!2456 (merged) and Phys!945 (merged). Related to Moore!862 (merged) and MooreAnalysis!39 (merged).

added ThOr cleanup labels

mentioned in merge request Moore!862 (merged)

resolved all threads

added 1 commit

• 3a27ff55 - Adapt to ThOr functor and algorithm naming changes.

Compare with previous version

added lhcb-run3-cleanup label

Thanks. Added lhcb-run3-cleanup to this and the two other MR so I get it for my own developments.

• [2021-06-17 22:38] Validation started with lhcb-master-mr#2484
• [2021-06-18 01:10] Automatic merge failed in [lhcb-run3-cleanup#239](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/239/DaVinci/checkout
• [2021-06-19 01:20] Automatic merge failed in [lhcb-run3-cleanup#240](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/240/DaVinci/checkout
• [2021-06-20 00:15] Automatic merge failed in [lhcb-run3-cleanup#241](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/241/DaVinci/checkout
• [2021-06-21 00:57] Automatic merge failed in [lhcb-run3-cleanup#242](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/242/DaVinci/checkout
• [2021-06-21 11:37] Validation started with lhcb-master-mr#2493
• [2021-06-21 16:01] Validation started with lhcb-master-mr#2496
• [2021-06-22 01:03] Automatic merge failed in [lhcb-run3-cleanup#243](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/243/DaVinci/checkout
• [2021-06-23 00:27] Validation started with lhcb-head#2980
• [2021-06-23 01:18] Automatic merge failed in [lhcb-run3-cleanup#244](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/244/DaVinci/checkout
• [2021-06-23 01:38] Validation started with lhcb-head#2980
• [2021-06-24 01:14] Automatic merge failed in [lhcb-run3-cleanup#245](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/245/DaVinci/checkout
• [2021-06-25 01:21] Automatic merge failed in [lhcb-run3-cleanup#246](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/246/DaVinci/checkout
• [2021-06-26 01:19] Automatic merge failed in [lhcb-run3-cleanup#247](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/247/DaVinci/checkout
• [2021-06-28 00:53] Automatic merge failed in [lhcb-run3-cleanup#248](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/248/DaVinci/checkout
• [2021-06-28 10:29] Validation started with lhcb-master-mr#2521
• [2021-06-29 00:14] Validation started with lhcb-gaudi-head#2972
• [2021-06-29 00:22] Validation started with lhcb-head-2#282
• [2021-06-29 00:23] Validation started with lhcb-head#2985
• [2021-06-29 00:33] Validation started with lhcb-lcg-dev3#1676
• [2021-06-29 00:38] Validation started with lhcb-lcg-dev4#1691
• [2021-06-29 01:19] Automatic merge failed in [lhcb-run3-cleanup#249](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/249/DaVinci/checkout
• [2021-06-29 01:23] Validation started with lhcb-sanitizers#895
• [2021-06-29 01:40] Validation started with lhcb-gaudi-head#2972
• [2021-06-29 01:52] Validation started with lhcb-sanitizers#895
• [2021-06-30 00:09] Validation started with lhcb-gaudi-head#2973
• [2021-06-30 00:31] Validation started with lhcb-lcg-dev3#1677
• [2021-06-30 00:31] Validation started with lhcb-head#2986
• [2021-06-30 00:31] Validation started with lhcb-head-2#283
• [2021-06-30 00:36] Validation started with lhcb-lcg-dev4#1692
• [2021-06-30 01:15] Automatic merge failed in [lhcb-run3-cleanup#250](https://lhcb-nightlies.web.cern.ch/nightly/lhcb-run3-cleanup/250/DaVinci/checkout
• [2021-06-30 01:30] Validation started with lhcb-sanitizers#896
• [2021-06-30 01:39] Validation started with lhcb-gaudi-head#2973
• [2021-06-30 10:58] Validation started with lhcb-head#2987

assigned to @ziyiw

added lhcb-head label

added DPA-WP3 label

removed lhcb-head label

added lhcb-head-2 label

mentioned in merge request Phys!945 (merged)

mentioned in merge request Rec!2456 (merged)

mentioned in merge request MooreAnalysis!39 (merged)

changed the description

approved this merge request

unassigned @ziyiw

@pkoppenb I've merged the other MRs, please take care of this one

added all-slots label

resolved all threads

resolved all threads

merged

mentioned in commit 070f6667