Improve user-interface, add special branch for common set of variables and introduce basic set of Kinematics functors

As evident from this options file, this MR addresses three issues which block the 'sub-master' issue (https://gitlab.cern.ch/lhcb-dpa/project/-/issues/6):

• Improving the user interface as discussed #13 (closed).
• Special branch ALL to have common set of variables for all introduced branches as discussed #12 (closed).
• Basic set of Kinematics functors (replacing TupleToolKinematics) as discussed here https://gitlab.cern.ch/lhcb-dpa/project/-/issues/113. This currently lives here but should be moves somewhere else where the NewTupleTools will live.

FYI @powen

This MR closes issues: #13 (closed), #12 (closed) and https://gitlab.cern.ch/lhcb-dpa/project/-/issues/113.

added DPA-WP3 Tuples enhancement labels

requested review from @erodrigu

changed the description

Currently I had to comment out the F.Mass functor from Kinematics, which does not seem to be imported correctly into the FunTupleBase class, hence the Draft: for MR (@mferrill could you please check whats going on? Have also made additions and modifications to the FunctorCollection class, check through).

This MR will break this example in DaVinci, but I would like to get some comments, specially on the options file here, before I go changing those.

added 1 commit

• de4b46a5 - change F.MASS to F.COMPOSITEMASS

Compare with previous version

marked this merge request as ready

resolved all threads

added 1 commit

• f281c734 - minor import error fix

Compare with previous version

added lhcb-run3-cleanup label

• [2021-06-10 01:20] Validation started with lhcb-run3-cleanup#233
• [2021-06-11 01:07] Validation started with lhcb-run3-cleanup#234
• [2021-06-12 01:16] Validation started with lhcb-run3-cleanup#235
• [2021-06-15 00:48] Validation started with lhcb-run3-cleanup#236
• [2021-06-16 01:03] Validation started with lhcb-run3-cleanup#237
• [2021-06-17 01:15] Validation started with lhcb-run3-cleanup#238
• [2021-06-18 01:10] Validation started with lhcb-run3-cleanup#239
• [2021-06-19 01:19] Validation started with lhcb-run3-cleanup#240
• [2021-06-20 00:14] Validation started with lhcb-run3-cleanup#241
• [2021-06-21 00:56] Validation started with lhcb-run3-cleanup#242
• [2021-06-22 01:03] Validation started with lhcb-run3-cleanup#243
• [2021-06-23 01:18] Validation started with lhcb-run3-cleanup#244
• [2021-06-24 01:13] Validation started with lhcb-run3-cleanup#245
• [2021-06-25 01:20] Validation started with lhcb-run3-cleanup#246
• [2021-06-26 01:18] Validation started with lhcb-run3-cleanup#247
• [2021-06-28 00:52] Validation started with lhcb-run3-cleanup#248
• [2021-06-29 01:18] Validation started with lhcb-run3-cleanup#249
• [2021-06-30 01:15] Validation started with lhcb-run3-cleanup#250
• [2021-07-01 01:09] Validation started with lhcb-run3-cleanup#251
• [2021-07-02 01:06] Validation started with lhcb-run3-cleanup#252
• [2021-07-03 01:17] Validation started with lhcb-run3-cleanup#253
• [2021-07-06 00:53] Validation started with lhcb-run3-cleanup#254

@amathad says this is basically ready, apart for a few print statements. @pkoppenb to review.

Cool. I will try and have a look as well if time permits ...

@amathad, if true that this MR closes the DPA issue 113 then write that so that the issue gets closed automatically when this gets merged :-).

Cool. I will try and have a look as well if time permits ...

@amathad, if true that this MR closes the DPA issue 113 then write that so that the issue gets closed automatically when this gets merged :-).

I just reached this MR by navigating issues from the very top. Indeed I think once this is done https://gitlab.cern.ch/lhcb-dpa/project/-/issues/113 can be closed.

changed the description

@erodrigu and @pkoppenb : With a hope that we are going to provide some basic FunctorCollection objects to tuple (Kinematic and Geometric quantities), @mferrill had started to collect them in this file, however not sure if this a good place for such a file to live. Can this be moved somewhere else?

Other topic: should this make this weeks full stack release, so we have it for the hackathon?

added 17 commits

• f281c734...7f632290 - 14 commits from branch master
• bf13f342 - Merge commit '7f632290' into AM_newtuplealgo
• 056dc503 - minor updates and cleanup
• 1ab9f879 - update the error message

Compare with previous version

added 1 commit

• 1e98a9c9 - Fixed formatting

Compare with previous version

mentioned in merge request DaVinci!558 (merged)

added 1 commit

• fac90c0e - updates with comments from ER and PK

Compare with previous version

• [2021-07-07 01:03] Validation started with lhcb-run3-cleanup#255
• [2021-07-08 01:18] Validation started with lhcb-run3-cleanup#256
• [2021-07-08 08:11] Validation started with lhcb-master-mr#2548

resolved all threads

added 2 commits

• 9d1fb172 - Turn wrapper classes into functions
• 17f77312 - Updates for DaVinciExample to work

Compare with previous version

added 1 commit

• d4677e4a - Fixed formatting

Compare with previous version

added all-slots label

approved this merge request

merged

mentioned in commit d7af8064